Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Synchronet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Main
Synchronet
Commits
de1759ea
Commit
de1759ea
authored
9 years ago
by
deuce
Browse files
Options
Downloads
Patches
Plain Diff
Move sdl_video_initialized into ciolib.c now since it's used there.
parent
4793f307
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/conio/ciolib.c
+4
-0
4 additions, 0 deletions
src/conio/ciolib.c
src/conio/sdlfuncs.c
+1
-1
1 addition, 1 deletion
src/conio/sdlfuncs.c
src/conio/sdlfuncs.h
+0
-1
0 additions, 1 deletion
src/conio/sdlfuncs.h
with
5 additions
and
2 deletions
src/conio/ciolib.c
+
4
−
0
View file @
de1759ea
...
@@ -119,6 +119,10 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_get_window_info(int *width, int *height, int
...
@@ -119,6 +119,10 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_get_window_info(int *width, int *height, int
CIOLIBEXPORT
void
CIOLIBCALL
ciolib_setscaling
(
int
new_value
);
CIOLIBEXPORT
void
CIOLIBCALL
ciolib_setscaling
(
int
new_value
);
CIOLIBEXPORT
int
CIOLIBCALL
ciolib_getscaling
(
void
);
CIOLIBEXPORT
int
CIOLIBCALL
ciolib_getscaling
(
void
);
#if defined(WITH_SDL) || defined(WITH_SDL_AUDIO)
int
sdl_video_initialized
=
0
;
#endif
#define CIOLIB_INIT() { if(initialized != 1) initciolib(CIOLIB_MODE_AUTO); }
#define CIOLIB_INIT() { if(initialized != 1) initciolib(CIOLIB_MODE_AUTO); }
#if defined(WITH_SDL) || defined(WITH_SDL_AUDIO)
#if defined(WITH_SDL) || defined(WITH_SDL_AUDIO)
...
...
This diff is collapsed.
Click to expand it.
src/conio/sdlfuncs.c
+
1
−
1
View file @
de1759ea
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
#undef main
#undef main
#endif
#endif
#include
"sdlfuncs.h"
#include
"sdlfuncs.h"
extern
int
sdl_video_initialized
;
#ifndef _WIN32
#ifndef _WIN32
struct
sdlfuncs
sdl
;
struct
sdlfuncs
sdl
;
...
@@ -25,7 +26,6 @@ struct sdlfuncs sdl;
...
@@ -25,7 +26,6 @@ struct sdlfuncs sdl;
static
int
sdl_funcs_loaded
=
0
;
static
int
sdl_funcs_loaded
=
0
;
static
int
sdl_initialized
=
0
;
static
int
sdl_initialized
=
0
;
static
int
sdl_audio_initialized
=
0
;
static
int
sdl_audio_initialized
=
0
;
int
sdl_video_initialized
=
0
;
static
int
(
*
sdl_drawing_thread
)(
void
*
data
)
=
NULL
;
static
int
(
*
sdl_drawing_thread
)(
void
*
data
)
=
NULL
;
static
void
(
*
sdl_exit_drawing_thread
)(
void
)
=
NULL
;
static
void
(
*
sdl_exit_drawing_thread
)(
void
)
=
NULL
;
static
int
main_returned
=
0
;
static
int
main_returned
=
0
;
...
...
This diff is collapsed.
Click to expand it.
src/conio/sdlfuncs.h
+
0
−
1
View file @
de1759ea
...
@@ -79,7 +79,6 @@ struct sdlfuncs {
...
@@ -79,7 +79,6 @@ struct sdlfuncs {
/* Defined in SDL_win32_main.c for Win32 */
/* Defined in SDL_win32_main.c for Win32 */
extern
struct
sdlfuncs
sdl
;
extern
struct
sdlfuncs
sdl
;
extern
SDL_sem
*
sdl_exit_sem
;
extern
SDL_sem
*
sdl_exit_sem
;
extern
int
sdl_video_initialized
;
#ifdef __cplusplus
#ifdef __cplusplus
extern
"C"
{
extern
"C"
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment