From ad0a99109cc14a3c00ff7e00d5e6466fba53020c Mon Sep 17 00:00:00 2001 From: mathnerd314 Date: Thu, 26 Nov 2009 23:38:25 +0000 Subject: [PATCH] Update tinygettext + CMakeLists.txt to use command-line option git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6123 837edb03-e0f3-0310-88ca-d4d4e8b29345 --- CMakeLists.txt | 7 +++++-- config.h.cmake | 2 -- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ea492c96..c5e326d10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,7 +138,10 @@ include_directories (${SUPERTUX_SOURCE_DIR}/external/binreloc/) FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${SUPERTUX_SOURCE_DIR} external/obstack/*.c external/findlocale/findlocale.c) -FILE(GLOB SUPERTUX_SOURCES_CXX RELATIVE ${SUPERTUX_SOURCE_DIR} src/main.cpp src/*/*.cpp src/supertux/menu/*.cpp src/video/sdl/*.cpp external/tinygettext/tinygettext/*.cpp) +FILE(GLOB SUPERTUX_SOURCES_CXX RELATIVE ${SUPERTUX_SOURCE_DIR} src/main.cpp src/*/*.cpp src/supertux/menu/*.cpp src/video/sdl/*.cpp) + +FILE(GLOB TINYGETTEXT_SOURCES_CXX RELATIVE ${SUPERTUX_SOURCE_DIR} external/tinygettext/tinygettext/*.cpp) +SET_SOURCE_FILES_PROPERTIES(${TINYGETTEXT_SOURCES_CXX} PROPERTIES COMPILE_DEFINITIONS HAVE_SDL) IF(HAVE_OPENGL) FILE(GLOB SUPERTUX_OPENGL_SOURCES RELATIVE ${SUPERTUX_SOURCE_DIR} src/video/gl/*.cpp) @@ -319,7 +322,7 @@ SET(EXECUTABLE_OUTPUT_PATH ${SUPERTUX_SOURCE_DIR}) ## Add target for supertux binary -ADD_EXECUTABLE(supertux2 ${SUPERTUX_SOURCES_C} ${SUPERTUX_SOURCES_CXX}) +ADD_EXECUTABLE(supertux2 ${SUPERTUX_SOURCES_C} ${SUPERTUX_SOURCES_CXX} ${TINYGETTEXT_SOURCES_CXX}) ## Link supertux binary with squirrel and other libraries diff --git a/config.h.cmake b/config.h.cmake index 3383961c3..90ca0e6fb 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -25,8 +25,6 @@ #cmakedefine HAVE_OPENGL -#cmakedefine HAVE_SDL - #cmakedefine HAVE_LIBCURL #endif /*CONFIG_H*/ -- 2.11.0