--- a/QTfrontend/CMakeLists.txt Sat Jan 04 23:55:54 2014 +0400
+++ b/QTfrontend/CMakeLists.txt Sun Jan 05 00:46:26 2014 +0400
@@ -63,7 +63,7 @@
include_directories(${SDLMIXER_INCLUDE_DIR})
include_directories(BEFORE ${PHYSFS_INCLUDE_DIR})
include_directories(BEFORE ${PHYSLAYER_INCLUDE_DIR})
-
+include_directories(${LUA_INCLUDE_DIR}) #brought by physlayer hwpacksmounter.h
if(UNIX)
# HACK: in freebsd cannot find iconv.h included via SDL.h
@@ -152,6 +152,11 @@
set(hwfr_rez hedgewars.qrc)
+if(${BUILD_ENGINE_LIBRARY})
+ add_definitions(-DHWLIBRARY=1)
+ set(hwlibname "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}hwengine${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ list(APPEND HW_LINK_LIBS ${hwlibname})
+endif()
qt4_add_resources(hwfr_rez_src ${hwfr_rez})
@@ -182,11 +187,6 @@
if(CMAKE_BUILD_TYPE MATCHES "RELEASE")
set(console_access "WIN32")
endif(CMAKE_BUILD_TYPE MATCHES "RELEASE")
-if(${BUILD_ENGINE_LIBRARY})
- add_definitions(-DHWLIBRARY=1)
- set(hwlibname "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}hwengine${CMAKE_SHARED_LIBRARY_SUFFIX}")
- list(APPEND HW_LINK_LIBS ${hwlibname})
-endif()
add_executable(hedgewars ${console_access}
${hwfr_src}
@@ -219,7 +219,6 @@
list(APPEND HW_LINK_LIBS stdc++)
endif()
-
target_link_libraries(hedgewars ${HW_LINK_LIBS})