From f33ab9beb17bd11cb55951cb04d24cef34f6dec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sun, 20 Jan 2013 01:16:07 +0100
Subject: [PATCH] Sync

---
 CMakeLists.txt      | 34 +++++++++++++++++++++++++++++++---
 data/settingsbase.h |  4 ++--
 stdinstance.cpp     |  0
 stdinstance.h       |  0
 4 files changed, 33 insertions(+), 5 deletions(-)
 delete mode 100644 stdinstance.cpp
 delete mode 100644 stdinstance.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45f1ddb04..370e01d0d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,8 +97,18 @@ configure_file("${PROJECT_SOURCE_DIR}/config.h.in"
 
 SET(MULTIMC_SOURCES
 main.cpp
-gui/mainwindow.cpp
+
+data/appsettings.cpp
+data/inifile.cpp
 data/instancebase.cpp
+data/instancelist.cpp
+data/settingsbase.cpp
+data/stdinstance.cpp
+
+gui/mainwindow.cpp
+gui/modeditwindow.cpp
+gui/settingsdialog.cpp
+
 util/pathutils.cpp
 
 java/javautils.cpp
@@ -107,8 +117,20 @@ java/annotations.cpp
 
 SET(MULTIMC_HEADERS
 gui/mainwindow.h
+gui/modeditwindow.h
+gui/settingsdialog.h
+
+data/appsettings.h
+data/inifile.h
 data/instancebase.h
+data/instancelist.h
+data/settingsbase.h
+data/settingsmacros.h
+data/settingsmacrosundef.h
+data/stdinstance.h
+
 util/pathutils.h
+
 multimc_pragma.h
 
 java/annotations.h
@@ -120,13 +142,19 @@ java/javautils.h
 java/membuffer.h
 )
 
+SET(MULTIMC5_UIS
+gui/mainwindow.ui
+gui/modeditwindow.ui
+gui/settingsdialog.ui
+)
+
 SET_SOURCE_FILES_PROPERTIES(resources/MultiMCLauncher.jar GENERATED)
 
-QT5_WRAP_UI(MULTIMC_UI gui/mainwindow.ui)
+QT5_WRAP_UI(MULTIMC_UI ${MULTIMC5_UIS})
 QT5_ADD_RESOURCES(MULTIMC_QRC multimc.qrc)
 
 add_executable(multimc5 ${MULTIMC_SOURCES} ${MULTIMC_HEADERS} ${MULTIMC_UI} ${MULTIMC_QRC})
 qt5_use_modules(multimc5 Widgets)
-link_libraries(multimc5 quazip patchlib)
+target_link_libraries(multimc5 quazip patchlib)
 add_dependencies(multimc5 MultiMCLauncher)
 install(TARGETS multimc5 RUNTIME DESTINATION bin)
diff --git a/data/settingsbase.h b/data/settingsbase.h
index 8a7e7e774..71f0e30de 100644
--- a/data/settingsbase.h
+++ b/data/settingsbase.h
@@ -18,7 +18,7 @@
 
 #include <QSettings>
 
-#include "../util/settingsmacros.h"
+#include "settingsmacros.h"
 
 class SettingsBase : public QSettings
 {
@@ -28,6 +28,6 @@ public:
 	
 };
 
-#include "../util/settingsmacrosundef.h"
+#include "settingsmacrosundef.h"
 
 #endif // SETTINGSBASE_H
diff --git a/stdinstance.cpp b/stdinstance.cpp
deleted file mode 100644
index e69de29bb..000000000
diff --git a/stdinstance.h b/stdinstance.h
deleted file mode 100644
index e69de29bb..000000000