From aff679338eae30675d888d7a9c1a0303e7bb2286 Mon Sep 17 00:00:00 2001 From: sfb Date: Thu, 18 Nov 2010 09:08:24 -0600 Subject: [PATCH] Changed: #842 Started adding World Editor to CMake build. --- .../leveldesign/world_editor/CMakeLists.txt | 5 ++++ .../world_editor/world_editor/CMakeLists.txt | 30 +++++++++++++++++++ .../world_editor_plugin/CMakeLists.txt | 26 ++++++++++++++++ .../CMakeLists.txt | 21 +++++++++++++ 4 files changed, 82 insertions(+) create mode 100644 code/ryzom/tools/leveldesign/world_editor/world_editor/CMakeLists.txt create mode 100644 code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/CMakeLists.txt create mode 100644 code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/CMakeLists.txt diff --git a/code/ryzom/tools/leveldesign/world_editor/CMakeLists.txt b/code/ryzom/tools/leveldesign/world_editor/CMakeLists.txt index 03045b297..95324525e 100644 --- a/code/ryzom/tools/leveldesign/world_editor/CMakeLists.txt +++ b/code/ryzom/tools/leveldesign/world_editor/CMakeLists.txt @@ -1,3 +1,8 @@ ADD_SUBDIRECTORY(land_export) ADD_SUBDIRECTORY(land_export_lib) +ADD_SUBDIRECTORY(world_editor) +ADD_SUBDIRECTORY(world_editor_primitive_plugin) + +# This is an old plugin and is deprecated. It doesn't even compile anymore. +#ADD_SUBDIRECTORY(world_editor_plugin) diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/CMakeLists.txt b/code/ryzom/tools/leveldesign/world_editor/world_editor/CMakeLists.txt new file mode 100644 index 000000000..23804da0c --- /dev/null +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/CMakeLists.txt @@ -0,0 +1,30 @@ +FILE(GLOB SRC *.cpp *.h) + +LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/export_cb_dlg.cpp ${CMAKE_CURRENT_SOURCE_DIR}/builder_logic.cpp) + +ENABLE_LANGUAGE(RC) +ADD_DEFINITIONS(${MFC_DEFINITIONS}) +SET(CMAKE_MFC_FLAG 2) + +ADD_EXECUTABLE(world_editor WIN32 ${SRC} world_editor.rc res/world_editor.rc2) + +SOURCE_GROUP(Resources FILES world_editor.rc res/world_editor.rc2) + +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(world_editor + nelmisc + nelligo + nel3d + nelgeorges + nelpacs + ${LIBXML2_LIBRARIES}) +ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) + +NL_DEFAULT_PROPS(world_editor "Ryzom, Tools, World: World Editor") +NL_ADD_RUNTIME_FLAGS(world_editor) + +IF(WITH_PCH) + ADD_NATIVE_PRECOMPILED_HEADER(world_editor ${CMAKE_CURRENT_SOURCE_DIR}/stdafx.h ${CMAKE_CURRENT_SOURCE_DIR}/stdafx.cpp) +ENDIF(WITH_PCH) + +INSTALL(TARGETS world_editor RUNTIME DESTINATION bin COMPONENT tools) diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/CMakeLists.txt b/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/CMakeLists.txt new file mode 100644 index 000000000..1a91cd575 --- /dev/null +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/CMakeLists.txt @@ -0,0 +1,26 @@ +FILE(GLOB SRC *.cpp *.h) + +ADD_LIBRARY(world_editor_plugin SHARED ${SRC} world_editor_plugin.rc) + +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) + +TARGET_LINK_LIBRARIES(world_editor_plugin + nelmisc + nel3d + nelsound + nelsnd_lowlevel + Version.lib) + +NL_DEFAULT_PROPS(world_editor_plugin "Ryzom, Tools, World: World Editor Plugin DLL") +NL_ADD_RUNTIME_FLAGS(world_editor_plugin) +NL_ADD_LIB_SUFFIX(world_editor_plugin) + +ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${MFC_DEFINITIONS} -DOBJECT_VIEWER_LIB_EXPORTS) + +IF(WITH_PCH) + ADD_NATIVE_PRECOMPILED_HEADER(world_editor_plugin ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.h ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.cpp) +ENDIF(WITH_PCH) + +INSTALL(TARGETS world_editor_plugin LIBRARY DESTINATION lib RUNTIME DESTINATION bin ARCHIVE DESTINATION lib COMPONENT tools3d) +INSTALL(FILES WorldEditorPlugin.cfg DESTINATION bin COMPONENT tools3d) + diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/CMakeLists.txt b/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/CMakeLists.txt new file mode 100644 index 000000000..13fe663ed --- /dev/null +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/CMakeLists.txt @@ -0,0 +1,21 @@ +FILE(GLOB SRC *.cpp *.h) + +ADD_LIBRARY(world_editor_primitive_plugin SHARED ${SRC}) + +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) + +TARGET_LINK_LIBRARIES(world_editor_primitive_plugin + nelmisc + nel3d + nelsound + nelsnd_lowlevel) + +NL_DEFAULT_PROPS(world_editor_primitive_plugin "Ryzom, Tools, World: World Editor Primitive Plugin") +NL_ADD_RUNTIME_FLAGS(world_editor_primitive_plugin) +NL_ADD_LIB_SUFFIX(world_editor_primitive_plugin) + +ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${MFC_DEFINITIONS} -DWIN32_DLL_EXPORTS) + + +INSTALL(TARGETS world_editor_primitive_plugin LIBRARY DESTINATION lib RUNTIME DESTINATION bin ARCHIVE DESTINATION lib COMPONENT tools3d) +