From f17a640c330c567b1d42f18b4bc1463cb61ec8f1 Mon Sep 17 00:00:00 2001 From: sfb Date: Fri, 15 Oct 2010 20:38:01 -0500 Subject: [PATCH] Changed: Added 'export' and 'prim_export' to CMake build for build_gamedata pipeline. --- code/ryzom/tools/leveldesign/CMakeLists.txt | 4 +++- .../tools/leveldesign/export/CMakeLists.txt | 20 +++++++++++-------- .../leveldesign/world_editor/CMakeLists.txt | 3 +++ .../world_editor/land_export/CMakeLists.txt | 12 +++++++++++ .../land_export_lib/CMakeLists.txt | 20 +++++++++++++++++++ .../world_editor/land_export_lib/export.cpp | 4 ++-- 6 files changed, 52 insertions(+), 11 deletions(-) create mode 100644 code/ryzom/tools/leveldesign/world_editor/CMakeLists.txt create mode 100644 code/ryzom/tools/leveldesign/world_editor/land_export/CMakeLists.txt create mode 100644 code/ryzom/tools/leveldesign/world_editor/land_export_lib/CMakeLists.txt diff --git a/code/ryzom/tools/leveldesign/CMakeLists.txt b/code/ryzom/tools/leveldesign/CMakeLists.txt index 5d6127949..2b6045998 100644 --- a/code/ryzom/tools/leveldesign/CMakeLists.txt +++ b/code/ryzom/tools/leveldesign/CMakeLists.txt @@ -3,6 +3,8 @@ ADD_SUBDIRECTORY(prim_export) ADD_SUBDIRECTORY(uni_conv) ADD_SUBDIRECTORY(csv_transform) ADD_SUBDIRECTORY(icon_search) +ADD_SUBDIRECTORY(export) +ADD_SUBDIRECTORY(world_editor) # Legacy folders, do not build #ADD_SUBDIRECTORY(export) @@ -26,4 +28,4 @@ ADD_SUBDIRECTORY(icon_search) #test_root # #variable_parser -#world_editor +# diff --git a/code/ryzom/tools/leveldesign/export/CMakeLists.txt b/code/ryzom/tools/leveldesign/export/CMakeLists.txt index 544764bed..ee2126b3a 100644 --- a/code/ryzom/tools/leveldesign/export/CMakeLists.txt +++ b/code/ryzom/tools/leveldesign/export/CMakeLists.txt @@ -1,16 +1,20 @@ -FILE(GLOB SRC *.cpp *.h) +FILE(GLOB SRC *.cpp ) +FILE(GLOB PRIV_H *.h) -ADD_EXECUTABLE(export ${SRC}) +NL_TARGET_LIB(ryzom_export ${PRIV_H} ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(export - ${LIBXML2_LIBRARIES} - nelmisc) +IF(WITH_STLPORT) + TARGET_LINK_LIBRARIES(ryzom_export ${CMAKE_THREAD_LIBS_INIT}) +ENDIF(WITH_STLPORT) -NL_DEFAULT_PROPS(export "Ryzom, Tools: Export") -NL_ADD_RUNTIME_FLAGS(export) +TARGET_LINK_LIBRARIES(ryzom_export nelmisc nelligo nelgeorges nel3d nelpacs ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES}) +NL_DEFAULT_PROPS(ryzom_export "Ryzom, Library, World: Export Tools") +NL_ADD_RUNTIME_FLAGS(ryzom_export) +NL_ADD_LIB_SUFFIX(ryzom_export) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) -INSTALL(TARGETS export RUNTIME DESTINATION bin COMPONENT tools) +INSTALL(TARGETS ryzom_export LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries) + diff --git a/code/ryzom/tools/leveldesign/world_editor/CMakeLists.txt b/code/ryzom/tools/leveldesign/world_editor/CMakeLists.txt new file mode 100644 index 000000000..03045b297 --- /dev/null +++ b/code/ryzom/tools/leveldesign/world_editor/CMakeLists.txt @@ -0,0 +1,3 @@ +ADD_SUBDIRECTORY(land_export) +ADD_SUBDIRECTORY(land_export_lib) + diff --git a/code/ryzom/tools/leveldesign/world_editor/land_export/CMakeLists.txt b/code/ryzom/tools/leveldesign/world_editor/land_export/CMakeLists.txt new file mode 100644 index 000000000..6ac51f423 --- /dev/null +++ b/code/ryzom/tools/leveldesign/world_editor/land_export/CMakeLists.txt @@ -0,0 +1,12 @@ +FILE(GLOB SRC *.cpp *.h) + +ADD_EXECUTABLE(land_export ${SRC}) + +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(land_export ${LIBXML2_LIBRARIES} nelmisc nelligo ryzom_landexport) +ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) + +NL_DEFAULT_PROPS(land_export "Ryzom, Tools, World: Land Export") +NL_ADD_RUNTIME_FLAGS(land_export) + +INSTALL(TARGETS land_export RUNTIME DESTINATION bin COMPONENT tools) diff --git a/code/ryzom/tools/leveldesign/world_editor/land_export_lib/CMakeLists.txt b/code/ryzom/tools/leveldesign/world_editor/land_export_lib/CMakeLists.txt new file mode 100644 index 000000000..e5ab7c6f0 --- /dev/null +++ b/code/ryzom/tools/leveldesign/world_editor/land_export_lib/CMakeLists.txt @@ -0,0 +1,20 @@ +FILE(GLOB SRC *.cpp ) +FILE(GLOB PRIV_H *.h) + +NL_TARGET_LIB(ryzom_landexport ${PRIV_H} ${SRC}) + +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) + +IF(WITH_STLPORT) + TARGET_LINK_LIBRARIES(ryzom_landexport ${CMAKE_THREAD_LIBS_INIT}) +ENDIF(WITH_STLPORT) + +TARGET_LINK_LIBRARIES(ryzom_landexport ryzom_export nelmisc nelligo nelgeorges nel3d nelpacs ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES}) +NL_DEFAULT_PROPS(ryzom_landexport "Ryzom, Library, World: Land Export") +NL_ADD_RUNTIME_FLAGS(ryzom_landexport) +NL_ADD_LIB_SUFFIX(ryzom_landexport) + +ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) + +INSTALL(TARGETS ryzom_landexport LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries) + diff --git a/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp b/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp index e0638ef7b..1bdc43ec6 100644 --- a/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp +++ b/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp @@ -31,8 +31,8 @@ #include "nel/3d/landscape.h" #include "nel/3d/scene_group.h" -#include "nel/../../src/ligo/zone_region.h" -#include "nel/../../src/ligo/zone_bank.h" +#include "nel/ligo/zone_region.h" +#include "nel/ligo/zone_bank.h" #include "nel/../../src/pacs/collision_mesh_build.h"