author | kergoth <kergoth> | 2002-12-09 22:39:57 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-12-09 22:39:57 (UTC) |
commit | 421f5d6b87f509430836fb2c60b57f9266371121 (patch) (unidiff) | |
tree | 98c968915b1a9dcdd8eb3e3565c8859127f1c3e9 /mkspecs/win32-visage/qmake.conf | |
parent | 8bf05369dcdf93a712607aab6dacf407dcce5142 (diff) | |
download | opie-421f5d6b87f509430836fb2c60b57f9266371121.zip opie-421f5d6b87f509430836fb2c60b57f9266371121.tar.gz opie-421f5d6b87f509430836fb2c60b57f9266371121.tar.bz2 |
Add a var to pass in libs from teh environment easily.. needed so that the OZ buildroot can pass in -lsupc++ on the link when building with gcc3.
Diffstat (limited to 'mkspecs/win32-visage/qmake.conf') (more/less context) (show whitespace changes)
-rw-r--r-- | mkspecs/win32-visage/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/win32-visage/qmake.conf b/mkspecs/win32-visage/qmake.conf index 87b3b8f..cbd0a7f 100644 --- a/mkspecs/win32-visage/qmake.conf +++ b/mkspecs/win32-visage/qmake.conf | |||
@@ -35,25 +35,25 @@ QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -Fo"$@" $< | |||
35 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$obj" $src | 35 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$obj" $src |
36 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$@" $< | 36 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$@" $< |
37 | 37 | ||
38 | QMAKE_LINK = icc -Tdp $(CFLAGS) | 38 | QMAKE_LINK = icc -Tdp $(CFLAGS) |
39 | QMAKE_LFLAGS = -nologo -code:RX -data:RW -def -noe $(LFLAGS_EXTRA) | 39 | QMAKE_LFLAGS = -nologo -code:RX -data:RW -def -noe $(LFLAGS_EXTRA) |
40 | QMAKE_LFLAGS_RELEASE= -OPTF | 40 | QMAKE_LFLAGS_RELEASE= -OPTF |
41 | QMAKE_LFLAGS_DEBUG= -de -br | 41 | QMAKE_LFLAGS_DEBUG= -de -br |
42 | QMAKE_LFLAGS_CONSOLE= -pmtype:vio | 42 | QMAKE_LFLAGS_CONSOLE= -pmtype:vio |
43 | QMAKE_LFLAGS_WINDOWS= -pmtype:pm | 43 | QMAKE_LFLAGS_WINDOWS= -pmtype:pm |
44 | QMAKE_LFLAGS_CONSOLE_DLL= -DLL | 44 | QMAKE_LFLAGS_CONSOLE_DLL= -DLL |
45 | QMAKE_LFLAGS_WINDOWS_DLL= -DLL | 45 | QMAKE_LFLAGS_WINDOWS_DLL= -DLL |
46 | 46 | ||
47 | QMAKE_LIBS = | 47 | QMAKE_LIBS = $(LIBS_EXTRA) |
48 | QMAKE_LIBS_CONSOLE= | 48 | QMAKE_LIBS_CONSOLE= |
49 | QMAKE_LIBS_WINDOWS= user32.lib gdi32.lib comdlg32.lib imm32.lib winmm.lib ole32.lib uuid.lib wsock32.lib | 49 | QMAKE_LIBS_WINDOWS= user32.lib gdi32.lib comdlg32.lib imm32.lib winmm.lib ole32.lib uuid.lib wsock32.lib |
50 | QMAKE_LIBS_QT = $(QTDIR)\lib\qt.lib | 50 | QMAKE_LIBS_QT = $(QTDIR)\lib\qt.lib |
51 | QMAKE_LIBS_QT_ENTRY= $(QTDIR)\lib\qtmain.lib | 51 | QMAKE_LIBS_QT_ENTRY= $(QTDIR)\lib\qtmain.lib |
52 | 52 | ||
53 | QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib | 53 | QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib |
54 | 54 | ||
55 | QMAKE_MOC = $(QTDIR)/bin/moc.exe | 55 | QMAKE_MOC = $(QTDIR)/bin/moc.exe |
56 | QMAKE_UIC = $(QTDIR)/bin/uic.exe | 56 | QMAKE_UIC = $(QTDIR)/bin/uic.exe |
57 | QMAKE_IDC = $(QTDIR)/bin/idc.exe | 57 | QMAKE_IDC = $(QTDIR)/bin/idc.exe |
58 | 58 | ||
59 | QMAKE_LIB = ilib | 59 | QMAKE_LIB = ilib |