Updates to new qmake-based build system

[ci skip]
MartijnHols · Aug 5, 2016 · 55f2e34 · 55f2e34
1 parent cc43e21
commit 55f2e34
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -81,3 +81,18 @@ SimulationCraft.app
 .qmake.stash
 qrc_simcqt.cpp
 *.autosave
+lib/build
+lib/release
+lib/debug
+lib/*.vcxproj*
+gui/build
+gui/release
+gui/debug
+gui/*.vcxproj*
+cli/build
+cli/release
+cli/debug
+cli/*.vcxproj*
+simulationcraft.sln
+simulationcraft*.db
+engine/simulationcraft.hpp.cpp
diff --git a/cli/cli.pro b/cli/cli.pro
@@ -12,10 +12,6 @@ CONFIG(debug, debug|release): LIBS += -L../lib/debug -lsimcengine
 win32 {
   CONFIG += console
   QMAKE_PROJECT_NAME = "Simulationcraft CLI"
-  !isEmpty(PGO) {
-    QMAKE_LFLAGS_RELEASE += /LTCG
-    QMAKE_CXXFLAGS_RELEASE += /GL
-  }
 }
 
 include(../source_files/QT_engine_main.pri)
diff --git a/gui/gui.pro b/gui/gui.pro
@@ -40,16 +40,6 @@ macx {
 win32 {
   QMAKE_PROJECT_NAME = "Simulationcraft GUI"
   RC_FILE = ../qt/simcqt.rc
-  !isEmpty(PGO) {
-    win32-msvc2015 {
-      QMAKE_LFLAGS_RELEASE += /LTCG /USEPROFILE
-    }
-
-    win32-msvc2013 {
-      QMAKE_CXXFLAGS_RELEASE += /GL
-      QMAKE_LFLAGS_RELEASE   += /LTCG
-    }
-  }
 }
 
 RESOURCES = \

diff --git a/lib/lib.pro b/lib/lib.pro
@@ -12,16 +12,6 @@ PRECOMPILED_HEADER = ../engine/simulationcraft.hpp
 
 win32 {
   QMAKE_PROJECT_NAME = "Simulationcraft Engine"
-  !isEmpty(PGO) {
-    win32-msvc2015 {
-      QMAKE_LFLAGS_RELEASE += /LTCG /USEPROFILE
-    }
-
-    win32-msvc2013 {
-      QMAKE_CXXFLAGS_RELEASE += /GL
-      QMAKE_LFLAGS_RELEASE   += /LTCG
-    }
-  }
 }
 
 !isEmpty(SC_DEFAULT_APIKEY) {

diff --git a/qt/simcqt.rc b/qt/simcqt.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource."
+//#include "resource."
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////

diff --git a/simulationcraft.pri b/simulationcraft.pri
@@ -40,4 +40,19 @@ macx {
 
 win32 {
   LIBS += -lwininet -lshell32
+	win32-msvc2013|win32-msvc2015 {
+			QMAKE_CXXFLAGS_RELEASE += /Ot /MP
+	}
+
+	!isEmpty(PGO) {
+		win32-msvc2013 {
+			QMAKE_LFLAGS_RELEASE += /LTCG
+			QMAKE_CXXFLAGS_RELEASE += /GL
+		}
+
+		win32-msvc2015 {
+			QMAKE_CXXFLAGS_RELEASE += /GL
+			QMAKE_LFLAGS_RELEASE   += /LTCG /USEPROFILE /PGD:"..\SimulationCraft64.pgd"
+		}
+  }
 }