From f2e49acd663e35b6da1c52de44931119fd8b5e12 Mon Sep 17 00:00:00 2001 From: Tim Goya Date: Tue, 9 Oct 2007 14:15:16 +0000 Subject: [PATCH 1/1] Fix warnings and build sqdbg SVN-Revision: 5166 --- CMakeLists.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 29dc36dba..8af187c1d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -116,13 +116,20 @@ LINK_DIRECTORIES(src/squirrel) ## Some additional include paths include_directories (${SUPERTUX_SOURCE_DIR}/src/) -include_directories (${SUPERTUX_SOURCE_DIR}/src/squirrel/) include_directories (${SUPERTUX_SOURCE_DIR}/src/squirrel/include/) ## Build list of sources for supertux binary FILE(GLOB SUPERTUX_SOURCES RELATIVE ${SUPERTUX_SOURCE_DIR} src/*.cpp src/audio/*.cpp src/badguy/*.cpp src/binreloc/*.cpp src/control/*.cpp src/gui/*.cpp src/lisp/*.cpp src/math/*.cpp src/object/*.cpp src/physfs/*.cpp src/sprite/*.cpp src/tinygettext/*.cpp src/trigger/*.cpp src/video/*.cpp src/worldmap/*.cpp src/scripting/*.cpp) +## Add in squirrel debug stuff + +IF(ENABLE_SQDBG) + include_directories (${SUPERTUX_SOURCE_DIR}/src/squirrel/) + FILE(GLOB SQDBG_SOURCES RELATIVE ${SUPERTUX_SOURCE_DIR} src/squirrel/sqdbg/*.cpp) + SET(SUPERTUX_SOURCES ${SQDBG_SOURCES} ${SUPERTUX_SOURCES}) +ENDIF(ENABLE_SQDBG) + ## Generate miniswig wrapper ADD_CUSTOM_COMMAND( @@ -134,7 +141,9 @@ ADD_CUSTOM_COMMAND( DEPENDS src/scripting/wrapper.interface.hpp tools/miniswig/miniswig ) -SET(SUPERTUX_SOURCES ${SUPERTUX_SOURCE_DIR}/src/scripting/wrapper.cpp ${SUPERTUX_SOURCES}) +IF(NOT EXISTS ${SUPERTUX_SOURCE_DIR}/src/scripting/wrapper.cpp) + SET(SUPERTUX_SOURCES ${SUPERTUX_SOURCES}) +ENDIF(NOT EXISTS ${SUPERTUX_SOURCE_DIR}/src/scripting/wrapper.cpp) ## If xgettext is available, generate messages.pot for sources -- 2.11.0