From 1ed19d867708213e20b49a7b0b8222cdae71f151 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Thu, 4 Feb 2016 12:27:41 +0100 Subject: [PATCH] Fix tools compilation --- code/ryzom/tools/leveldesign/georges_dll/CMakeLists.txt | 1 + .../tools/leveldesign/world_editor/world_editor/CMakeLists.txt | 2 ++ code/ryzom/tools/leveldesign/world_editor/world_editor/stdafx.h | 1 + 3 files changed, 4 insertions(+) diff --git a/code/ryzom/tools/leveldesign/georges_dll/CMakeLists.txt b/code/ryzom/tools/leveldesign/georges_dll/CMakeLists.txt index 0192615ca..fd7160b51 100644 --- a/code/ryzom/tools/leveldesign/georges_dll/CMakeLists.txt +++ b/code/ryzom/tools/leveldesign/georges_dll/CMakeLists.txt @@ -4,6 +4,7 @@ FILE(GLOB SRC *.cpp *.h) ADD_LIBRARY(georges_dll SHARED ${SRC} georges_edit.rc) INCLUDE_DIRECTORIES(${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(georges_dll nelmisc nelgeorges) NL_DEFAULT_PROPS(georges_dll "Ryzom, Tools, Georges: Georges Dll") diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/CMakeLists.txt b/code/ryzom/tools/leveldesign/world_editor/world_editor/CMakeLists.txt index c1364751b..30f28b1c9 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor/CMakeLists.txt +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/CMakeLists.txt @@ -8,6 +8,8 @@ SET(CMAKE_MFC_FLAG 2) ADD_EXECUTABLE(world_editor WIN32 ${SRC} world_editor.rc) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) + SOURCE_GROUP(Resources FILES world_editor.rc) TARGET_LINK_LIBRARIES(world_editor diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/stdafx.h b/code/ryzom/tools/leveldesign/world_editor/world_editor/stdafx.h index c8b41e3fd..d8fe8ec31 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor/stdafx.h +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/stdafx.h @@ -110,6 +110,7 @@ extern bool DontUse3D; +#include //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line.