forked from Mirrors/openclonk
Move TinyXML into thirdparty/
parent
8019e7b0c8
commit
b8d3b00d90
|
@ -508,12 +508,6 @@ set(OC_CLONK_SOURCES
|
||||||
src/script/C4ValueArray.h
|
src/script/C4ValueArray.h
|
||||||
src/script/C4ValueMap.cpp
|
src/script/C4ValueMap.cpp
|
||||||
src/script/C4ValueMap.h
|
src/script/C4ValueMap.h
|
||||||
src/tinyxml/tinystr.cpp
|
|
||||||
src/tinyxml/tinystr.h
|
|
||||||
src/tinyxml/tinyxml.cpp
|
|
||||||
src/tinyxml/tinyxml.h
|
|
||||||
src/tinyxml/tinyxmlerror.cpp
|
|
||||||
src/tinyxml/tinyxmlparser.cpp
|
|
||||||
src/zlib/gzio.c
|
src/zlib/gzio.c
|
||||||
src/zlib/zutil.h
|
src/zlib/zutil.h
|
||||||
)
|
)
|
||||||
|
@ -653,6 +647,7 @@ include_directories(
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/src/game/object
|
${CMAKE_CURRENT_SOURCE_DIR}/src/game/object
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/src/lib/texture
|
${CMAKE_CURRENT_SOURCE_DIR}/src/lib/texture
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/src/script
|
${CMAKE_CURRENT_SOURCE_DIR}/src/script
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/thirdparty
|
||||||
)
|
)
|
||||||
|
|
||||||
############################################################################
|
############################################################################
|
||||||
|
@ -926,7 +921,7 @@ if(HAVE_PRECOMPILED_HEADERS)
|
||||||
foreach(FILE ${OC_SOURCES})
|
foreach(FILE ${OC_SOURCES})
|
||||||
get_filename_component(FILE_EXT ${FILE} EXT)
|
get_filename_component(FILE_EXT ${FILE} EXT)
|
||||||
get_filename_component(FILE_NAME_WE ${FILE} NAME_WE)
|
get_filename_component(FILE_NAME_WE ${FILE} NAME_WE)
|
||||||
if(FILE_EXT STREQUAL ".cpp" AND NOT FILE_NAME_WE MATCHES "tiny.*")
|
if(FILE_EXT STREQUAL ".cpp")
|
||||||
# This check is necessary since gzio.c gets compiled as C
|
# This check is necessary since gzio.c gets compiled as C
|
||||||
# code, which can't use C++ PCH.
|
# code, which can't use C++ PCH.
|
||||||
set_property(SOURCE ${FILE} PROPERTY COMPILE_FLAGS /YuC4Include.h)
|
set_property(SOURCE ${FILE} PROPERTY COMPILE_FLAGS /YuC4Include.h)
|
||||||
|
@ -975,6 +970,10 @@ endif()
|
||||||
|
|
||||||
CHECK_INCLUDE_FILE_CXX(getopt.h HAVE_GETOPT_H)
|
CHECK_INCLUDE_FILE_CXX(getopt.h HAVE_GETOPT_H)
|
||||||
|
|
||||||
|
# TinyXML
|
||||||
|
add_subdirectory(thirdparty/tinyxml)
|
||||||
|
target_link_libraries(clonk tinyxml)
|
||||||
|
|
||||||
if(GENERATE_MINI_DUMP)
|
if(GENERATE_MINI_DUMP)
|
||||||
FIND_PATH(DBGHELP_INCLUDE_DIR NAMES dbghelp.h)
|
FIND_PATH(DBGHELP_INCLUDE_DIR NAMES dbghelp.h)
|
||||||
FINDLIB(DBGHELP_LIBRARIES NAMES dbghelp)
|
FINDLIB(DBGHELP_LIBRARIES NAMES dbghelp)
|
||||||
|
|
18
Makefile.am
18
Makefile.am
|
@ -59,6 +59,7 @@ AM_CPPFLAGS = \
|
||||||
-I$(srcdir)/src/game/object \
|
-I$(srcdir)/src/game/object \
|
||||||
-I$(srcdir)/src/lib/texture \
|
-I$(srcdir)/src/lib/texture \
|
||||||
-I$(srcdir)/src/script \
|
-I$(srcdir)/src/script \
|
||||||
|
-I$(srcdir)/thirdparty \
|
||||||
$(GLEW_CFLAGS) $(GTK_CFLAGS) $(OPENAL_CFLAGS) $(FREETYPE_CFLAGS) $(SDL_CFLAGS) $(BOOST_CPPFLAGS)
|
$(GLEW_CFLAGS) $(GTK_CFLAGS) $(OPENAL_CFLAGS) $(FREETYPE_CFLAGS) $(SDL_CFLAGS) $(BOOST_CPPFLAGS)
|
||||||
|
|
||||||
##BUILT_SOURCES = hgrevision.h
|
##BUILT_SOURCES = hgrevision.h
|
||||||
|
@ -521,12 +522,17 @@ src/script/C4Value.cpp \
|
||||||
src/script/C4Value.h \
|
src/script/C4Value.h \
|
||||||
src/script/C4ValueMap.cpp \
|
src/script/C4ValueMap.cpp \
|
||||||
src/script/C4ValueMap.h \
|
src/script/C4ValueMap.h \
|
||||||
src/tinyxml/tinystr.cpp \
|
src/zlib/gzio.c \
|
||||||
src/tinyxml/tinystr.h \
|
src/zlib/zutil.h \
|
||||||
src/tinyxml/tinyxml.cpp \
|
src/script/C4AulDebug.h \
|
||||||
src/tinyxml/tinyxmlerror.cpp \
|
src/script/C4AulExec.h \
|
||||||
src/tinyxml/tinyxml.h \
|
src/C4Version.h.in \
|
||||||
src/tinyxml/tinyxmlparser.cpp
|
thirdparty/tinyxml/tinystr.cpp \
|
||||||
|
thirdparty/tinyxml/tinystr.h \
|
||||||
|
thirdparty/tinyxml/tinyxml.cpp \
|
||||||
|
thirdparty/tinyxml/tinyxml.h \
|
||||||
|
thirdparty/tinyxml/tinyxmlerror.cpp \
|
||||||
|
thirdparty/tinyxml/tinyxmlparser.cpp
|
||||||
|
|
||||||
if WIN32
|
if WIN32
|
||||||
clonk_SOURCES += src/platform/C4FileClasses.cpp src/editor/C4ConsoleWin32.cpp
|
clonk_SOURCES += src/platform/C4FileClasses.cpp src/editor/C4ConsoleWin32.cpp
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
add_library(tinyxml
|
||||||
|
tinystr.cpp
|
||||||
|
tinystr.h
|
||||||
|
tinyxml.cpp
|
||||||
|
tinyxml.h
|
||||||
|
tinyxmlerror.cpp
|
||||||
|
tinyxmlparser.cpp
|
||||||
|
)
|
||||||
|
|
Loading…
Reference in New Issue