# HG changeset patch
# User thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282>
# Date 1325169986 0
# Node ID 4aa9130f4e9f7853df5c6fad4abe7e7110d5e678
# Parent  de02d5ea97701b1bbbb0eec28c030d016ba33354
Cleaned up and corrected the qmake project file a bit.

git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@1063 59b1889a-e5ac-428c-b0c7-476e01d41282

diff -r de02d5ea9770 -r 4aa9130f4e9f UniversalIndentGUI.pro
--- a/UniversalIndentGUI.pro	Thu Dec 29 10:45:49 2011 +0000
+++ b/UniversalIndentGUI.pro	Thu Dec 29 14:46:26 2011 +0000
@@ -16,10 +16,10 @@
 CONFIG += debug_and_release
 
 macx {
- CONFIG += x86 x86_64 sdk
- # qscintilla needs to be build with:
+ # If using as framework qscintilla needs to be build with:
  # qmake -spec macx-g++ CONFIG+=sdk CONFIG+=x86_64 CONFIG+=x86 CONFIG+=lib_bundle qscintilla.pro && make && sudo make install
- LIBS += -framework qscintilla2
+ #LIBS += -framework qscintilla2
+ LIBS += -lqscintilla2
  ICON = resources/UniversalIndentGUI.icns
 }
 else {
@@ -31,8 +31,11 @@
 win32:pipe2nul = ">NUL"
 unix:pipe2nul = "&> /dev/null"
 macx:pipe2nul = "&> /dev/null"
+
+
+# Language file processing
+##########################
 message(Updating language files)
-
 lupdate = lupdate
 unix:lupdate = lupdate-qt4
 macx:lupdate = lupdate
@@ -68,22 +71,22 @@
 # Copy Qts own translation files to the local translation directory
 message ( Copy Qts own translation files to the local translation directory )
 qtTranslationInstallDir = $$[QT_INSTALL_TRANSLATIONS]
-win32:qtTranslationInstallDir = $$replace(qtTranslationInstallDir, /, \)
+win32:qtTranslationInstallDir = $$replace(qtTranslationInstallDir, /, \\)
 unix:system(cp $${qtTranslationInstallDir}/qt_de.qm ./translations/ $$pipe2nul)
 unix:system(cp $${qtTranslationInstallDir}/qt_fr.qm ./translations/ $$pipe2nul)
 unix:system(cp $${qtTranslationInstallDir}/qt_ja.qm ./translations/ $$pipe2nul)
 unix:system(cp $${qtTranslationInstallDir}/qt_ru.qm ./translations/ $$pipe2nul)
 unix:system(cp $${qtTranslationInstallDir}/qt_uk.qm ./translations/ $$pipe2nul)
 unix:system(cp $${qtTranslationInstallDir}/qt_zh_TW.qm ./translations/ $$pipe2nul)
-win32:system(copy $${qtTranslationInstallDir}\qt_de.qm .\translations\ /Y $$pipe2nul)
-win32:system(copy $${qtTranslationInstallDir}\qt_fr.qm .\translations\ /Y $$pipe2nul)
-win32:system(copy $${qtTranslationInstallDir}\qt_ja.qm .\translations\ /Y $$pipe2nul)
-win32:system(copy $${qtTranslationInstallDir}\qt_ru.qm .\translations\ /Y $$pipe2nul)
-win32:system(copy $${qtTranslationInstallDir}\qt_uk.qm .\translations\ /Y $$pipe2nul)
-win32:system(copy $${qtTranslationInstallDir}\qt_zh_TW.qm .\translations\ /Y $$pipe2nul)
+win32:system(copy $${qtTranslationInstallDir}\\qt_de.qm .\\translations\\ /Y $$pipe2nul)
+win32:system(copy $${qtTranslationInstallDir}\\qt_fr.qm .\\translations\\ /Y $$pipe2nul)
+win32:system(copy $${qtTranslationInstallDir}\\qt_ja.qm .\\translations\\ /Y $$pipe2nul)
+win32:system(copy $${qtTranslationInstallDir}\\qt_ru.qm .\\translations\\ /Y $$pipe2nul)
+win32:system(copy $${qtTranslationInstallDir}\\qt_uk.qm .\\translations\\ /Y $$pipe2nul)
+win32:system(copy $${qtTranslationInstallDir}\\qt_zh_TW.qm .\\translations\\ /Y $$pipe2nul)
 
-# Defining files that shall be installed
-########################################
+# Defining files that shall be installed when calling "make install"
+####################################################################
 # Create and install man page
 exists( ./doc/universalindentgui.1* ) {
     unix:system(rm ./doc/universalindentgui.1*)
@@ -126,44 +129,6 @@
 
 }
 
-#######################
-# remove linker flag "-mthreads" so the mingwm10.dll is no longer needed
-#######################
-win32 {
-    message ( remove linker flag "-mthreads" so the mingwm10.dll is no longer needed )
-    #message(old flags:$${QMAKE_LFLAGS})
-    parameters = $${QMAKE_LFLAGS}
-    newFlags =
-    for(parameter, parameters) {
-        !contains(parameter, -mthreads) {
-            newFlags += $${parameter}
-        }
-    }
-    QMAKE_LFLAGS = $${newFlags}
-    #message(new flags:$${QMAKE_LFLAGS})
-
-    parameters = $${QMAKE_LFLAGS_EXCEPTIONS_ON}
-    newFlags =
-    for(parameter, parameters) {
-        !contains(parameter, -mthreads) {
-            newFlags += $${parameter}
-        }
-    }
-    QMAKE_LFLAGS_EXCEPTIONS_ON = $${newFlags}
-
-    parameters = $${QMAKE_CXXFLAGS_EXCEPTIONS_ON}
-    newFlags =
-    for(parameter, parameters) {
-        !contains(parameter, -mthreads) {
-            newFlags += $${parameter}
-        }
-    }
-    QMAKE_CXXFLAGS_EXCEPTIONS_ON = $${newFlags}
-}
-#######################
-
-
-
 CONFIG(debug, debug|release) {
     DESTDIR = ./debug
     DEFINES += _DEBUG DEBUG
@@ -224,3 +189,13 @@
 
 RESOURCES += resources/Icons.qrc
 RC_FILE    = resources/programicon.rc
+
+
+
+#message(Creating symbolic links within target dir for debugging)
+#macx:system(ln -s $$PWD/config ./debug/config)
+#macx:system(ln -s $$PWD/indenters ./debug/indenters)
+#macx:system(ln -s $$PWD/translations ./debug/translations)
+#macx:system(ln -s $$PWD/config ./release/config)
+#macx:system(ln -s $$PWD/indenters ./release/indenters)
+#macx:system(ln -s $$PWD/translations ./release/translations)