static libs pro files change

trevormerritt · Jul 20, 2016 · eb4d10c · eb4d10c
1 parent 43a9a0e
commit eb4d10c
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 1,194 deletions.
diff --git a/Common/base.pri b/Common/base.pri
@@ -127,3 +127,6 @@ core_debug {
 plugin {
     DESTDIR = $$CORE_BUILDS_LIBRARIES_PATH
 }
+staticlib {
+    DESTDIR = $$CORE_BUILDS_LIBRARIES_PATH
+}
diff --git a/DesktopEditor/Qt_build/graphics/project/graphics.pri b/DesktopEditor/Qt_build/graphics/project/graphics.pri
@@ -9,41 +9,23 @@ DEFINES += \
     MNG_STORE_CHUNKS\
     MNG_ERROR_TELLTALE
 
-linux-g++ | linux-g++-64 | linux-g++-32 {
+core_linux {
     DEFINES += \
     HAVE_UNISTD_H \
-    LINUX \
-    _LINUX \
-    _LINUX_QT
-
-    CONFIG += c++11
     QMAKE_CXXFLAGS += -Wno-narrowing
-
-    message(linux)
 }
 
-mac {
+core_mac {
     DEFINES += \
-    HAVE_UNISTD_H \
-    _LINUX \
-    _LINUX_QT \
-    _MAC \
-    QT_MAC
-
-    message(mac)
+    HAVE_UNISTD_H
 }
 
-win32 {
+core_windows {
     DEFINES += \
     JAS_WIN_MSVC_BUILD \
-    WIN32 \
     NOMINMAX
 
     DEFINES -= UNICODE
-
-    QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
-
-    message(windows)
 }
 
 LIB_GRAPHICS_PRI_PATH = $$PWD/../../..
@@ -56,7 +38,7 @@ INCLUDEPATH += \
     $$LIB_GRAPHICS_PRI_PATH/cximage/png \
     $$LIB_GRAPHICS_PRI_PATH/cximage/zlib
 
-SOURCES += $$LIB_GRAPHICS_PRI_PATH/Qt_build/graphics/project/graphics_pri.cpp
+SOURCES += $$PWD/graphics_pri.cpp
 
 SOURCES += $$LIB_GRAPHICS_PRI_PATH/freetype-2.5.2/src/base/ftbbox.c \
     $$LIB_GRAPHICS_PRI_PATH/freetype-2.5.2/src/base/ftgxval.c \