← Back to branch summary

~ubuntu-branches/ubuntu/raring/mumble/raring

« back to all changes in this revision

Viewing changes to compiler.pri

  • Committer: Bazaar Package Importer
  • Author(s): Thorvald Natvig
  • Date: 2010-01-09 19:28:50 UTC
  • mfrom: (9.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100109192850-zs4g5vwrrpd71kob
Tags: 1.2.1-2
Fix upgrade failure when upgrading mumble-server directly from 1.1.x
to 1.2.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
compiler.pri
40
40
        } else {
41
41
                QMAKE_CFLAGS_RELEASE *= -Ox -Ot /fp:fast /Qfast_transcendentals -Ob2
42
42
                QMAKE_CXXFLAGS_RELEASE *= -Ox -Ot /fp:fast /Qfast_transcendentals -Ob2
 
43
                CONFIG(analyze) {
 
44
                        QMAKE_CFLAGS_DEBUG *= /analyze
 
45
                        QMAKE_CXXFLAGS_DEBUG *= /analyze
 
46
                }
43
47
                DEFINES *= RESTRICT=
44
48
        }
45
49
 
63
67
                }
64
68
                INCLUDEPATH *= "$$VLD_DIR/include"
65
69
                LIBPATH *= "$$VLD_DIR/lib"
 
70
        } else {
 
71
                QMAKE_LFLAGS *= /MANIFESTUAC:\"level=\'asInvoker\' uiAccess=\'true\'\"
66
72
        }
67
73
}
68
74
 
118
124
        INCLUDEPATH *= /opt/mumble-1.2/include
119
125
        LIBPATH *= /opt/mumble-1.2/lib
120
126
 
121
 
        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
 
127
        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
122
128
        XCODE_PATH=$$system(xcode-select -print-path)
123
129
        QMAKE_MAC_SDK = $${XCODE_PATH}/SDKs/MacOSX10.5.sdk
124
130
 
130
136
        QMAKE_CXXFLAGS += -mmacosx-version-min=10.4 -Xarch_i386 -mmmx -Xarch_i386 -msse -Xarch_i386 -msse2
131
137
        QMAKE_LFLAGS += -Wl,-dead_strip -framework Cocoa -framework Carbon
132
138
 
 
139
        CONFIG(no-cocoa) {
 
140
                # The no-cocoa option basically means that we should build without depending on
 
141
                # a Cocoa build of Qt. However, for the most part, the reason we do this is to
 
142
                # run on older versions of Mac OS X. We 'abuse' that to disable features we don't
 
143
                # want enabled on Mac OS X 10.4.
 
144
                QMAKE_CFLAGS -= -fno-stack-protector -fno-stack-protector-all
 
145
                QMAKE_CXXFLAGS -= -fno-stack-protector -fno-stack-protector-all
 
146
        }
 
147
 
133
148
        CONFIG(symbols) {
134
149
                QMAKE_CFLAGS *= -gfull -gdwarf-2
135
150
                QMAKE_CXXFLAGS *= -gfull -gdwarf-2