From 00742af3a6f6d25fbd3b3b77744e8f39a8c14c71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Mon, 26 Aug 2013 02:53:29 +0200
Subject: OS compatibility and generic cleanup.

Removed bspatch/patchlib
Now builds and runs on Windows
---
 CMakeLists.txt | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fead64c..258123aa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,19 +36,11 @@ find_package(Qt5Network REQUIRED)
 
 include_directories(${Qt5Widgets_INCLUDE_DIRS})
 
-# Find ZLIB for quazip
-find_package(ZLIB REQUIRED)
-
-
 ######## Included Libs ########
 
 # Add quazip
 add_subdirectory(depends/quazip)
-include_directories(depends/quazip ${ZLIB_INCLUDE_DIRS})
-
-# Add bspatch
-add_subdirectory(depends/patchlib)
-include_directories(depends/patchlib)
+include_directories(depends/quazip)
 
 # Add the java launcher
 add_subdirectory(depends/launcher)
@@ -148,6 +140,9 @@ configure_file("${PROJECT_SOURCE_DIR}/config.h.in"
 ######## Other Stuff ########
 
 ADD_DEFINITIONS(-DQUAZIP_STATIC)
+ADD_DEFINITIONS(-DLIBSETTINGS_STATIC)
+ADD_DEFINITIONS(-DLIBUTIL_STATIC)
+ADD_DEFINITIONS(-DLIBGROUPVIEW_STATIC)
 
 ################################ FILES ################################
 
@@ -341,7 +336,7 @@ ADD_EXECUTABLE(MultiMC MACOSX_BUNDLE WIN32
 
 # Link
 QT5_USE_MODULES(MultiMC Widgets Network Xml)
-TARGET_LINK_LIBRARIES(MultiMC quazip patchlib libUtil libSettings libGroupView ${MultiMC_LINK_ADDITIONAL_LIBS})
+TARGET_LINK_LIBRARIES(MultiMC quazip libUtil libSettings libGroupView ${MultiMC_LINK_ADDITIONAL_LIBS})
 ADD_DEPENDENCIES(MultiMC MultiMCLauncher libUtil libSettings libGroupView)
 
 
-- 
cgit v1.2.3