osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Compile .cpp files with CXXFLAGS the same as CFLAGS used for compiling .c files. 

svn path=/trunk/; revision=40781
This commit is contained in:
Bill Meier 2012-01-30 23:55:34 +00:00
parent a3de46bf3e
commit cf24e97617
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui/qt/QtShark.pro
View File

@ -30,6 +30,11 @@ message( $$QMAKE_CFLAGS)
message( $$QMAKE_CFLAGS_RELEASE)
message( $$QMAKE_CFLAGS_DEBUG)
message( )
message(CXXFLAGS:)
message( $$QMAKE_CXXFLAGS)
message( $$QMAKE_CXXFLAGS_RELEASE)
message( $$QMAKE_CXXFLAGS_DEBUG)
message( )
message(LFLAGS:)
message( $$QMAKE_LFLAGS)
message( $$QMAKE_LFLAGS_RELEASE)
@ -67,8 +72,9 @@ win32 {
# Use only Wireshark CFLAGS and LDFLAGS from config.nmake (as provided via config.pri)
# for building the "release" version of Wireshark-Qt
# (e.g., so we don't get the Qt release CFLAGS [specifically /O2]
QMAKE_CFLAGS_RELEASE = ""
QMAKE_LFLAGS_RELEASE = ""
QMAKE_CFLAGS_RELEASE = ""
QMAKE_CXXFLAGS_RELEASE = ""
QMAKE_LFLAGS_RELEASE = ""
# XXX We need to figure out how to pull this in from config.nmake.
!include( config.pri ) {
@ -88,6 +94,11 @@ message( $$QMAKE_CFLAGS)
message( $$QMAKE_CFLAGS_RELEASE)
message( $$QMAKE_CFLAGS_DEBUG)
message( )
message(CXXFLAGS:)
message( $$QMAKE_CXXFLAGS)
message( $$QMAKE_CXXFLAGS_RELEASE)
message( $$QMAKE_CXXFLAGS_DEBUG)
message( )
message(LFLAGS:)
message( $$QMAKE_LFLAGS)
message( $$QMAKE_LFLAGS_RELEASE)