diff options
| author | Thomas Tanner <trtanner@btinternet.com> | 2015-11-18 20:51:52 +0000 |
|---|---|---|
| committer | Thomas Tanner <trtanner@btinternet.com> | 2015-11-18 20:51:52 +0000 |
| commit | 7f9af7f93e1d06d021fd60bf4845d928f4a6bc38 (patch) | |
| tree | bb6735a1c3546890205ebd4ea75f3f4fd1fb94e6 | |
| parent | d1932bfc8ec190db2ac8878f32e77ea45e897a02 (diff) | |
| parent | 56ba058cd54d073280eb86978d178e45253e6e19 (diff) | |
Merge remote-tracking branch 'refs/remotes/TanninOne/master'
| -rw-r--r-- | src/CMakeLists.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 22b725de..9ef5d1bc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -272,16 +272,20 @@ SET(default_project_path "${CMAKE_SOURCE_DIR}/..") GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH) SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects") -SET(lib_path "${project_path}/../install/libs") +SET(lib_path "${project_path}/../../install/libs") + + +MESSAGE(STATUS ${lib_path}) +MESSAGE(STATUS ${project_path}) INCLUDE_DIRECTORIES(${project_path}/uibase/src ${project_path}/bsatk/src ${project_path}/esptk/src ${project_path}/archive/src - ${project_path}/plugin/game_features/src) + ${project_path}/game_features/src) INCLUDE_DIRECTORIES(shared ${ZLIB_INCLUDE_DIRS}) LINK_DIRECTORIES(${lib_path} - ${project_path}/zlib/lib) + ${project_path}/../zlib/lib) ADD_DEFINITIONS(-D_UNICODE -DUNICODE -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS) @@ -298,7 +302,7 @@ SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/LTCG /INCREMENTAL:NO /LARGEADDRESSAWARE /OPT:REF /OPT:ICF") -QT5_USE_MODULES(ModOrganizer Widgets Declarative Network WebEngineWidgets) +QT5_USE_MODULES(ModOrganizer Widgets Declarative Network WebKitWidgets) ############### |