Fixing pro files to properly rebuild projects when their dependencies are rebuilt (needs to be done for Mac/Linux as well at some point)

This commit is contained in:
parax0 2015-12-16 03:27:27 -07:00
parent 0de2bf5bac
commit f11a8b938b
4 changed files with 24 additions and 3 deletions

View File

@ -4,7 +4,8 @@
#
#-------------------------------------------------
QT -= core gui
QT -= core gui
QMAKE_CXXFLAGS += /WX
CONFIG += staticlib
TEMPLATE = lib

View File

@ -5,6 +5,7 @@
#-------------------------------------------------
QT -= core gui
QMAKE_CXXFLAGS += /WX
CONFIG += staticlib
TEMPLATE = lib
@ -28,6 +29,9 @@ CONFIG (debug, debug|release) {
-L$$PWD/../../externals/FileIO/lib/ -lFileIOd \
-L$$PWD/../../externals/tinyxml2/lib/ -ltinyxml2d
win32 {
PRE_TARGETDEPS += $$PWD/../../build/Common/Commond.lib
}
}
CONFIG (release, debug|release) {
@ -41,6 +45,10 @@ CONFIG (release, debug|release) {
-L$$PWD/../../externals/boost_1_56_0/lib32-msvc-12.0 -llibboost_filesystem-vc120-mt-1_56 \
-L$$PWD/../../externals/FileIO/lib/ -lFileIO \
-L$$PWD/../../externals/tinyxml2/lib/ -ltinyxml2
win32 {
PRE_TARGETDEPS += -L$$PWD/../../build/Common/Common.lib
}
}
# Debug/Release Libs

View File

@ -5,6 +5,7 @@
#-------------------------------------------------
QT += core gui opengl widgets
QMAKE_CXXFLAGS += /WX
RESOURCES += Icons.qrc
CONFIG += console
@ -26,6 +27,11 @@ CONFIG(debug, debug|release) {
-L$$PWD/../../externals/assimp/lib/ -lassimp-vc120-mtd \
-L$$PWD/../../externals/FileIO/lib/ -lFileIOd \
-L$$PWD/../../externals/tinyxml2/lib/ -ltinyxml2d
win32 {
PRE_TARGETDEPS += $$PWD/../../build/Common/Commond.lib \
$$PWD/../../build/Core/Cored.lib
}
}
CONFIG(release, debug|release) {
@ -41,6 +47,11 @@ CONFIG(release, debug|release) {
-L$$PWD/../../externals/assimp/lib/ -lassimp-vc120-mt \
-L$$PWD/../../externals/FileIO/lib/ -lFileIO \
-L$$PWD/../../externals/tinyxml2/lib/ -ltinyxml2
win32 {
PRE_TARGETDEPS += -L$$PWD/../../build/Common/ -lCommon \
-L$$PWD/../../build/Core/ -lCore
}
}
# Debug/Release Libs

View File

@ -4,11 +4,12 @@
#
#-------------------------------------------------
TEMPLATE = subdirs
QMAKE_CXXFLAGS += /WX
CONFIG += ordered
TEMPLATE = subdirs
SUBDIRS += \
Common \
Core \
Editor
CONFIG += ordered