From ae7e0049c61b2f762474ca9dfec533438a072244 Mon Sep 17 00:00:00 2001 From: shlainn Date: Tue, 24 Jan 2012 10:38:07 +0100 Subject: [PATCH] Fix Irrlicht build on windows --- src/dep/src/irrlicht/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/dep/src/irrlicht/CMakeLists.txt b/src/dep/src/irrlicht/CMakeLists.txt index b4131d6..21d350a 100644 --- a/src/dep/src/irrlicht/CMakeLists.txt +++ b/src/dep/src/irrlicht/CMakeLists.txt @@ -1,4 +1,4 @@ -set(INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/src/dep/include ${PROJECT_SOURCE_DIR}/src/dep/include/irrlicht ${PROJECT_SOURCE_DIR}/src/dep/include/zlib) +set(INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/src/dep/include ${PROJECT_SOURCE_DIR}/src/dep/include/irrlicht ${PROJECT_SOURCE_DIR}/src/dep/include/zlib ${PROJECT_SOURCE_DIR}/src/Client/GUI/) if(WIN32) set(LIBTYPE SHARED) set(INCLUDE_DIRS ${INCLUDE_DIRS} ${DirectX_D3D9_INCLUDE_DIR} ${DirectX_D3DX9_INCLUDE_DIR}) @@ -323,8 +323,11 @@ irrXML.cpp os.cpp additions/CImageLoaderBLP.cpp + +${PROJECT_SOURCE_DIR}/src/Client/GUI/CM2Mesh.cpp ) if(WIN32) SET_TARGET_PROPERTIES (irrlicht PROPERTIES DEFINE_SYMBOL "IRRLICHT_EXPORTS" ) target_link_libraries (irrlicht ${DirectX_D3D9_LIBRARY} ${DirectX_D3DX9_LIBRARY} Winmm) + install(TARGETS irrlicht DESTINATION ${CMAKE_INSTALL_PREFIX}) # irrlicht needs to go to the install dir on windows as it's a dll endif()