equal
deleted
inserted
replaced
57 if(APPLE AND (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64*") AND (NOT QT_MAC_USE_COCOA)) |
57 if(APPLE AND (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64*") AND (NOT QT_MAC_USE_COCOA)) |
58 message(FATAL_ERROR "Building the 64 bit version of Hedgewars *requires* the Cocoa variant of QT on Mac OS X") |
58 message(FATAL_ERROR "Building the 64 bit version of Hedgewars *requires* the Cocoa variant of QT on Mac OS X") |
59 endif() |
59 endif() |
60 endif() |
60 endif() |
61 |
61 |
62 |
|
63 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/hwconsts.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/hwconsts.cpp) |
62 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/hwconsts.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/hwconsts.cpp) |
64 |
63 |
65 file(GLOB NetCpp net/*.cpp) |
64 file(GLOB NetCpp net/*.cpp) |
66 file(GLOB ModelCpp model/*.cpp) |
65 file(GLOB ModelCpp model/*.cpp) |
67 file(GLOB_RECURSE UIcpp ui/*.cpp) |
66 file(GLOB_RECURSE UIcpp ui/*.cpp) |
156 set(HW_LINK_LIBS ${SPARKLE_LIBRARY} ${HW_LINK_LIBS}) |
155 set(HW_LINK_LIBS ${SPARKLE_LIBRARY} ${HW_LINK_LIBS}) |
157 endif() |
156 endif() |
158 endif() |
157 endif() |
159 endif() |
158 endif() |
160 |
159 |
|
160 if(BUILD_ENGINE_LIBRARY) |
|
161 add_definitions(-DHWLIBRARY) |
|
162 set(HW_LINK_LIBS hwengine ${HW_LINK_LIBS}) |
|
163 link_directories(${EXECUTABLE_OUTPUT_PATH}) |
|
164 endif() |
|
165 |
161 |
166 |
162 add_executable(hedgewars WIN32 |
167 add_executable(hedgewars WIN32 |
163 ${hwfr_src} |
168 ${hwfr_src} |
164 ${hwfr_moc_srcs} |
169 ${hwfr_moc_srcs} |
165 ${hwfr_hdrs} |
170 ${hwfr_hdrs} |