diff generator/generator.pri @ 384:d2f48c4cb3e3

Same behavior of shared libs on linux and windows. Minor build script fixes.
author Max Samukha <maxter@spambox.com>
date Fri, 16 Jul 2010 20:04:29 +0300
parents e78566595089
children
line wrap: on
line diff
--- a/generator/generator.pri	Mon Jul 12 22:50:58 2010 +0300
+++ b/generator/generator.pri	Fri Jul 16 20:04:29 2010 +0300
@@ -1,77 +1,65 @@
 isEmpty(GENERATORPATH):GENERATORPATH = $$PWD
 INCLUDEPATH += $$GENERATORPATH
-
 TEMPLATE = app
-TARGET +=
-DEPENDPATH += $$GENERATORPATH tests parser
+TARGET += 
+DEPENDPATH += $$GENERATORPATH \
+    tests \
+    parser
 mac:CONFIG -= app_bundle
 INCLUDEPATH += $$GENERATORPATH/.
 INCLUDEPATH += $$GENERATORPATH/../common
-
 unix:CONFIG += debug_and_release
-
 CONFIG += console
 RESOURCES += generator.qrc
-
 include($$GENERATORPATH/parser/rxx.pri)
-
 include($$GENERATORPATH/parser/rpp/rpp.pri)
-
-win32-msvc2005:{
-        QMAKE_CXXFLAGS += -wd4996
-        QMAKE_CFLAGS += -wd4996
+win32-msvc2005: { 
+    QMAKE_CXXFLAGS += -wd4996
+    QMAKE_CFLAGS += -wd4996
 }
 
 # Input
-HEADERS += \
-        $$GENERATORPATH/generator.h \
-        $$GENERATORPATH/main.h \
-        $$GENERATORPATH/reporthandler.h \
-        $$GENERATORPATH/typeparser.h \
-        $$GENERATORPATH/typesystem.h \
-        $$GENERATORPATH/asttoxml.h \
-        $$GENERATORPATH/fileout.h \
-        $$GENERATORPATH/generatorset.h \
-        $$GENERATORPATH/metajava.h \
-        $$GENERATORPATH/customtypes.h \
-        $$GENERATORPATH/abstractmetabuilder.h \
-        $$GENERATORPATH/abstractmetalang.h \
-        $$GENERATORPATH/prigenerator.h \
-
-
-
-
-SOURCES += \
-        $$GENERATORPATH/generator.cpp \
-        $$GENERATORPATH/main.cpp \
-        $$GENERATORPATH/reporthandler.cpp \
-        $$GENERATORPATH/typeparser.cpp \
-        $$GENERATORPATH/typesystem.cpp \
-        $$GENERATORPATH/asttoxml.cpp \
-        $$GENERATORPATH/fileout.cpp \
-        $$GENERATORPATH/generatorset.cpp \
-        $$GENERATORPATH/metajava.cpp \
-        $$GENERATORPATH/customtypes.cpp \
-        $$GENERATORPATH/abstractmetabuilder.cpp \
-        $$GENERATORPATH/abstractmetalang.cpp \
-        $$GENERATORPATH/prigenerator.cpp \
-
-
-
-QT = core xml
-
-win32{
-        PRECOMPILED_HEADER = generator_pch.h
-        CONFIG += precompile_header
+HEADERS += $$GENERATORPATH/generator.h \
+    $$GENERATORPATH/main.h \
+    $$GENERATORPATH/reporthandler.h \
+    $$GENERATORPATH/typeparser.h \
+    $$GENERATORPATH/typesystem.h \
+    $$GENERATORPATH/asttoxml.h \
+    $$GENERATORPATH/fileout.h \
+    $$GENERATORPATH/generatorset.h \
+    $$GENERATORPATH/metajava.h \
+    $$GENERATORPATH/customtypes.h \
+    $$GENERATORPATH/abstractmetabuilder.h \
+    $$GENERATORPATH/abstractmetalang.h \
+    $$GENERATORPATH/prigenerator.h \
+    global.h
+SOURCES += $$GENERATORPATH/generator.cpp \
+    $$GENERATORPATH/main.cpp \
+    $$GENERATORPATH/reporthandler.cpp \
+    $$GENERATORPATH/typeparser.cpp \
+    $$GENERATORPATH/typesystem.cpp \
+    $$GENERATORPATH/asttoxml.cpp \
+    $$GENERATORPATH/fileout.cpp \
+    $$GENERATORPATH/generatorset.cpp \
+    $$GENERATORPATH/metajava.cpp \
+    $$GENERATORPATH/customtypes.cpp \
+    $$GENERATORPATH/abstractmetabuilder.cpp \
+    $$GENERATORPATH/abstractmetalang.cpp \
+    $$GENERATORPATH/prigenerator.cpp \
+    global.cpp
+QT = core \
+    xml
+win32 { 
+    PRECOMPILED_HEADER = generator_pch.h
+    CONFIG += precompile_header
 }
-
-win32-msvc.net {
-        QMAKE_CXXFLAGS += /Zm500
-        QMAKE_CXXFLAGS -= -Zm200
-        QMAKE_CFLAGS -= -Zm200
+win32-msvc.net { 
+    QMAKE_CXXFLAGS += /Zm500
+    QMAKE_CXXFLAGS -= -Zm200
+    QMAKE_CFLAGS -= -Zm200
 }
-
-mac {
-    contains(QT_CONFIG, x86):contains(QT_CONFIG, ppc):CONFIG += x86 ppc
+mac { 
+    contains(QT_CONFIG, x86):contains(QT_CONFIG, ppc):CONFIG += x86 \
+        ppc
     CONFIG -= precompile_header
 }