[Traverso-commit] traverso/src 3rdparty/slv2/slv2.pro appbase.pri...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/06/04 10:11:24

Modified files:
        src/3rdparty/slv2: slv2.pro 
        src            : appbase.pri base.pri 

Log message:
        some build script improvements (I hope)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/3rdparty/slv2/slv2.pro?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/appbase.pri?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/base.pri?cvsroot=traverso&r1=1.33&r2=1.34

Patches:
Index: 3rdparty/slv2/slv2.pro
===================================================================
RCS file: /sources/traverso/traverso/src/3rdparty/slv2/slv2.pro,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- 3rdparty/slv2/slv2.pro      23 Apr 2007 11:47:44 -0000      1.1
+++ 3rdparty/slv2/slv2.pro      4 Jun 2007 10:11:23 -0000       1.2
@@ -2,8 +2,8 @@
 
 contains(DEFINES, LV2_SUPPORT) {
 
-CONFIG -= dll
-CONFIG += static
+CONFIG -= dll qt 
+CONFIG += static  create_prl
 TEMPLATE = lib 
 INCLUDEPATH += slv2
 QMAKE_CFLAGS_DEBUG += -std=c99

Index: appbase.pri
===================================================================
RCS file: /sources/traverso/traverso/src/appbase.pri,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- appbase.pri 20 Apr 2006 14:50:15 -0000      1.1
+++ appbase.pri 4 Jun 2007 10:11:24 -0000       1.2
@@ -1,3 +1,3 @@
 include(base.pri)
 
- 
+CONFIG += link_prl

Index: base.pri
===================================================================
RCS file: /sources/traverso/traverso/src/base.pri,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- base.pri    4 Jun 2007 08:37:58 -0000       1.33
+++ base.pri    4 Jun 2007 10:11:24 -0000       1.34
@@ -1,9 +1,10 @@
 ##### Do NOT modify this!###############
 CONFIG -= release debug
-################################
+########################################
 
 
 ###### START USER CONFIGURATION ########
+########################################
 
 #
 # Choose debug or release build
@@ -17,21 +18,11 @@
 # Mac OS X, ALSA support will be disabled automatically.
 #
 
-DEFINES += JACK_SUPPORT
+#DEFINES += JACK_SUPPORT
 DEFINES += ALSA_SUPPORT
 DEFINES += PORTAUDIO_SUPPORT
 DEFINES += LV2_SUPPORT
 
-#DEFINES += STATIC_BUILD
-#DEFINES += USE_MEM_CHECKER
-
-DEFINES += QT_430_SCROLLBAR_FIX
-
-!macx{
-       DEFINES += PRECOMPILED_HEADER
-}
-
-#QMAKE_CXXFLAGS +=  -fstack-protector-all
 
 #
 # Uncomment the line which notes your CPU type
@@ -52,16 +43,22 @@
 DEFINES += USE_MLOCK
 
 ####### END USER CONFIGURATION ########
+########################################
 
 
 
 
-CONFIG += warn_on \
-#        link_prl \
-         qt
 
-QT += xml
+#DEFINES += STATIC_BUILD
+DEFINES += QT_430_SCROLLBAR_FIX
+!macx{
+       DEFINES += PRECOMPILED_HEADER
+}
+#QMAKE_CXXFLAGS +=  -fstack-protector-all
+
 
+CONFIG += warn_on qt
+QT += xml
 
 MOC_DIR = build 
 UI_DIR = build 
@@ -85,7 +82,6 @@
        release {
                
 #              DEFINES += USE_DEBUGGER
-               
 #              QMAKE_CXXFLAGS_RELEASE += -g
 #              QMAKE_CXXFLAGS_RELEASE += -finline-functions