Fix build errors

cxong · Feb 14, 2016 · 20a10ea · 20a10ea
1 parent 92af0b3
commit 20a10ea
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/make_gcw0.sh b/make_gcw0.sh
@@ -3,7 +3,7 @@
 # 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
-rm CMakeCache.txt
+rm CMakeCache.txt -f
 rm gcw0build -rf
 mkdir gcw0build
 cd gcw0build

diff --git a/src/mainmenu.c b/src/mainmenu.c
@@ -391,7 +391,9 @@ static void CheckLANServers(menu_t *menu, void *data)
 }
 
 static menu_t *MenuCreateOptionsGraphics(const char *name, MenuSystem *ms);
+#if !defined(__ANDROID__) && !defined(__GCWZERO__)
 static menu_t *MenuCreateOptionsControls(const char *name, MenuSystem *ms);
+#endif
 
 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);
 
+#if !defined(__ANDROID__) && !defined(__GCWZERO__)
 menu_t *MenuCreateOptionsControls(const char *name, MenuSystem *ms)
 {
 	menu_t *menu = MenuCreateNormal(
@@ -464,6 +467,7 @@ menu_t *MenuCreateOptionsControls(const char *name, MenuSystem *ms)
 	MenuSetPostInputFunc(menu, PostInputConfigApply, ms);
 	return menu;
 }
+#endif
 
 menu_t *MenuCreateQuit(const char *name)
 {

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
@@ -68,6 +68,8 @@ add_executable(config_test
 	../cdogs/config_old.h
 	../cdogs/json_utils.c
 	../cdogs/json_utils.h
+	../cdogs/log.c
+	../cdogs/log.h
 	../cdogs/utils.c
 	../cdogs/utils.h)
 target_link_libraries(config_test