ich777/cdogs-sdl
1
0
Fork 0
mirror of https://github.com/cxong/cdogs-sdl.git synced 2025-07-22 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix build errors

Browse Source
This commit is contained in:
cxong
2016-02-14 12:43:24 +00:00
parent 92af0b3846
commit 20a10ea296
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
make_gcw0.sh
View File

@@ -3,7 +3,7 @@
# To create a debug build, run `cmake -D CMAKE_BUILD_TYPE=Debug .` instead # To create a debug build, run `cmake -D CMAKE_BUILD_TYPE=Debug .` instead
# For more info: http://github.com/cxong/cdogs-sdl/wiki/Developer-Getting-Started:-GCW-Zero # For more info: http://github.com/cxong/cdogs-sdl/wiki/Developer-Getting-Started:-GCW-Zero
rm CMakeCache.txt rm CMakeCache.txt -f
rm gcw0build -rf rm gcw0build -rf
mkdir gcw0build mkdir gcw0build
cd gcw0build cd gcw0build

4
src/mainmenu.c
View File

@@ -391,7 +391,9 @@ static void CheckLANServers(menu_t *menu, void *data)
} }
static menu_t *MenuCreateOptionsGraphics(const char *name, MenuSystem *ms); static menu_t *MenuCreateOptionsGraphics(const char *name, MenuSystem *ms);
#if !defined(__ANDROID__) && !defined(__GCWZERO__)
static menu_t *MenuCreateOptionsControls(const char *name, MenuSystem *ms); static menu_t *MenuCreateOptionsControls(const char *name, MenuSystem *ms);
#endif
static menu_t *MenuCreateOptions(const char *name, MenuSystem *ms) static menu_t *MenuCreateOptions(const char *name, MenuSystem *ms)
{ {
@@ -451,6 +453,7 @@ menu_t *MenuCreateOptionsGraphics(const char *name, MenuSystem *ms)
menu_t *MenuCreateKeys(const char *name, MenuSystem *ms); menu_t *MenuCreateKeys(const char *name, MenuSystem *ms);
#if !defined(__ANDROID__) && !defined(__GCWZERO__)
menu_t *MenuCreateOptionsControls(const char *name, MenuSystem *ms) menu_t *MenuCreateOptionsControls(const char *name, MenuSystem *ms)
{ {
menu_t *menu = MenuCreateNormal( menu_t *menu = MenuCreateNormal(
@@ -464,6 +467,7 @@ menu_t *MenuCreateOptionsControls(const char *name, MenuSystem *ms)
MenuSetPostInputFunc(menu, PostInputConfigApply, ms); MenuSetPostInputFunc(menu, PostInputConfigApply, ms);
return menu; return menu;
} }
#endif
menu_t *MenuCreateQuit(const char *name) menu_t *MenuCreateQuit(const char *name)
{ {

2
src/tests/CMakeLists.txt
View File

@@ -68,6 +68,8 @@ add_executable(config_test
../cdogs/config_old.h ../cdogs/config_old.h
../cdogs/json_utils.c ../cdogs/json_utils.c
../cdogs/json_utils.h ../cdogs/json_utils.h
../cdogs/log.c
../cdogs/log.h
../cdogs/utils.c ../cdogs/utils.c
../cdogs/utils.h) ../cdogs/utils.h)
target_link_libraries(config_test target_link_libraries(config_test