Merge remote-tracking branch 'TanninOne/master'

4 files changed, 48 insertions, 12 deletions

diff --git a/.gitignore b/.gitignore
index 78e57a55..c5c631d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,9 @@ src/moc_*.cpp
 src/ui_*.h
 src/*.qrc.depends
 src/Modorganizer.*
+CMakeLists.txt.user
+edit
+stderr.log
+stdout.log
+build
+.idea
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfd8f902..e255f2b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,14 +1,14 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
-SET(DEPENDENCIES_DIR CACHE PATH "")
+PROJECT(organizer)
 
+SET(DEPENDENCIES_DIR CACHE PATH "")
 # hint to find qt in dependencies path
-SET(CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR}/qt5/lib/cmake)
+LIST(APPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR}/qt5/lib/cmake)
 
 FILE(GLOB_RECURSE BOOST_ROOT ${DEPENDENCIES_DIR}/boost*/project-config.jam)
 GET_FILENAME_COMPONENT(BOOST_ROOT ${BOOST_ROOT} DIRECTORY)
 
-FILE(GLOB_RECURSE ZLIB_ROOT ${DEPENDENCIES_DIR}/zlib*/zlib.h)
-GET_FILENAME_COMPONENT(ZLIB_ROOT ${ZLIB_ROOT} DIRECTORY)
+SET(ZLIB_ROOT ${DEPENDENCIES_DIR}/zlib)
 
 ADD_SUBDIRECTORY(src)
\ No newline at end of file
diff --git a/readme.md b/readme.md
index 130b8dfb..5965614e 100644
--- a/readme.md
+++ b/readme.md
@@ -4,4 +4,37 @@ Mod Organizer (MO) is a tool for managing mod collections of arbitrary size. It
 

 ## Building

 

-Please refer to [TanninOne/modorganizer-umbrella](https://github.com/TanninOne/modorganizer-umbrella) for build instructions.
\ No newline at end of file
+Please refer to [TanninOne/modorganizer-umbrella](https://github.com/TanninOne/modorganizer-umbrella) for build instructions.

+

+## Other Repositories

+

+MO consists of multiple repositories on github. The Umbrella project will download them automatically as required. They should however also be buildable individually.

+Here is a complete list:

+* https://github.com/TanninOne/modorganizer

+* https://github.com/TanninOne/modorganizer-uibase

+* https://github.com/TanninOne/modorganizer-hookdll

+* https://github.com/TanninOne/modorganizer-bsatk

+* https://github.com/TanninOne/modorganizer-esptk

+* https://github.com/TanninOne/modorganizer-archive

+* https://github.com/TanninOne/modorganizer-nxmhandler

+* https://github.com/TanninOne/modorganizer-lootcli

+* https://github.com/TanninOne/modorganizer-helper

+* https://github.com/TanninOne/modorganizer-tool_nmmimport

+* https://github.com/TanninOne/modorganizer-tool_pyniedit

+* https://github.com/TanninOne/modorganizer-tool_inieditor

+* https://github.com/TanninOne/modorganizer-preview_base

+* https://github.com/TanninOne/modorganizer-diagnose_basic

+* https://github.com/TanninOne/modorganizer-installer_quick

+* https://github.com/TanninOne/modorganizer-installer_manual

+* https://github.com/TanninOne/modorganizer-installer_fomod

+* https://github.com/TanninOne/modorganizer-installer_bundle

+* https://github.com/TanninOne/modorganizer-installer_bain

+* https://github.com/TanninOne/modorganizer-game_skyrim

+* https://github.com/TanninOne/modorganizer-game_oblivion

+* https://github.com/TanninOne/modorganizer-game_fallout3

+* https://github.com/TanninOne/modorganizer-game_falloutnv

+* https://github.com/TanninOne/modorganizer-game_gamebryo

+* https://github.com/TanninOne/modorganizer-game_features

+* https://github.com/TanninOne/modorganizer-check_fnis

+* https://github.com/TanninOne/modorganizer-plugin_python

+* https://github.com/TanninOne/modorganizer-bsa_extractor

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ab981e1b..c2d0b42a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,4 @@
 CMAKE_MINIMUM_REQUIRED (VERSION 2.8)
-PROJECT(organizer)
 
 CMAKE_POLICY(SET CMP0020 NEW)
 #CMAKE_POLICY(SET CMP0043 NEW)
@@ -167,7 +166,6 @@ SET(organizer_HDRS
     aboutdialog.h
     json.h
     safewritefile.h
-    pdll.h
     modflagicondelegate.h
     genericicondelegate.h
     organizerproxy.h
@@ -208,14 +206,12 @@ SET(organizer_UIS
     mainwindow.ui
     lockeddialog.ui
     installdialog.ui
-    fomodinstallerdialog.ui
     finddialog.ui
     editexecutablesdialog.ui
     downloadlistwidgetcompact.ui
     downloadlistwidget.ui
     credentialsdialog.ui
     categoriesdialog.ui
-    baincomplexinstallerdialog.ui
     activatemodsdialog.ui
     profileinputdialog.ui
     savetextasdialog.ui
@@ -283,8 +279,9 @@ INCLUDE_DIRECTORIES(${project_path}/uibase/src
                     ${project_path}/esptk/src
                     ${project_path}/archive/src
                     ${project_path}/plugin/game_features/src)
-INCLUDE_DIRECTORIES(shared)
-LINK_DIRECTORIES(${lib_path})
+INCLUDE_DIRECTORIES(shared ${ZLIB_INCLUDE_DIRS})
+LINK_DIRECTORIES(${lib_path}
+                 ${project_path}/zlib/lib)
 
 ADD_DEFINITIONS(-D_UNICODE -DUNICODE -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS)
 
@@ -301,7 +298,7 @@ SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES LINK_FLAGS_RELWITHDEBINFO
                       "/LTCG /INCREMENTAL:NO /LARGEADDRESSAWARE /OPT:REF /OPT:ICF")
 
 
-QT5_USE_MODULES(ModOrganizer Widgets Declarative Network WebkitWidgets)
+QT5_USE_MODULES(ModOrganizer Widgets Declarative Network WebEngineWidgets)
 
 
 ###############