diff options
| author | Tannin <sherb@gmx.net> | 2015-11-17 19:10:15 +0100 |
|---|---|---|
| committer | Tannin <sherb@gmx.net> | 2015-11-17 19:12:53 +0100 |
| commit | 0bd38e3f67c39fb37f75f639b81b02c100ad3375 (patch) | |
| tree | 7360e10227abdebe280624266a0f7b295ca37ff8 /src/CMakeLists.txt | |
| parent | 7f4f4cafea5a196ddf824adf7c4e65cec5d44d88 (diff) | |
| parent | 56ba058cd54d073280eb86978d178e45253e6e19 (diff) | |
Merge branch 'master' into new_vfs_library
Conflicts:
src/CMakeLists.txt
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c508df52..a52e500b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -274,17 +274,22 @@ 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}/usvfs/usvfs) + ${project_path}/usvfs/usvfs + ${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) @@ -308,7 +313,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) ############### |