diff options
| author | sapier <Sapier at GMX dot net> | 2013-06-23 18:30:21 +0200 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2013-07-02 19:58:20 -0400 |
| commit | 967121a34bbc60e6b46c7ec470b151f668ef1fef (patch) | |
| tree | e5cc5ec845d3c286bcb0e203e3a5f146950bfaf1 /src/CMakeLists.txt | |
| parent | fe4ce03d529f70346b2e2c4872223ebdcd37fffa (diff) | |
| download | minetest-967121a34bbc60e6b46c7ec470b151f668ef1fef.tar.gz minetest-967121a34bbc60e6b46c7ec470b151f668ef1fef.tar.bz2 minetest-967121a34bbc60e6b46c7ec470b151f668ef1fef.zip | |
Replace C++ mainmenu by formspec powered one
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bcd265858..2b60ff0d2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -271,6 +271,7 @@ set(common_SRCS staticobject.cpp serverlist.cpp pathfinder.cpp + convert_json.cpp ${SCRIPT_SRCS} ${UTIL_SRCS} ) @@ -313,7 +314,6 @@ set(minetest_SRCS clientobject.cpp chat.cpp hud.cpp - guiMainMenu.cpp guiKeyChangeMenu.cpp guiMessageMenu.cpp guiTextInputMenu.cpp @@ -323,15 +323,16 @@ set(minetest_SRCS guiVolumeChange.cpp guiDeathScreen.cpp guiChatConsole.cpp - guiCreateWorld.cpp - guiConfigureWorld.cpp - guiConfirmMenu.cpp client.cpp filecache.cpp tile.cpp shader.cpp game.cpp main.cpp + guiEngine.cpp + guiLuaApi.cpp + guiFileSelectMenu.cpp + convert_json.cpp ) if(USE_FREETYPE) @@ -488,7 +489,7 @@ else() endif() set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops") - set(CMAKE_CXX_FLAGS_DEBUG "-g -O1 -Wall ${WARNING_FLAGS} ${OTHER_FLAGS}") + set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall ${WARNING_FLAGS} ${OTHER_FLAGS}") if(USE_GPROF) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg") |