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-msvc/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-msvc/qmake.conf') (more/less context) (ignore whitespace changes)
-rw-r--r-- | mkspecs/win32-msvc/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/win32-msvc/qmake.conf b/mkspecs/win32-msvc/qmake.conf index 3a6e650..6175be3 100644 --- a/mkspecs/win32-msvc/qmake.conf +++ b/mkspecs/win32-msvc/qmake.conf | |||
@@ -50,49 +50,49 @@ QMAKE_CXXFLAGS_MT_DBG = $$QMAKE_CFLAGS_MT_DBG | |||
50 | QMAKE_CXXFLAGS_MT_DLL= $$QMAKE_CFLAGS_MT_DLL | 50 | QMAKE_CXXFLAGS_MT_DLL= $$QMAKE_CFLAGS_MT_DLL |
51 | QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG | 51 | QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG |
52 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 52 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
53 | QMAKE_CXXFLAGS_STL= $$QMAKE_CFLAGS_STL | 53 | QMAKE_CXXFLAGS_STL= $$QMAKE_CFLAGS_STL |
54 | 54 | ||
55 | QMAKE_INCDIR = | 55 | QMAKE_INCDIR = |
56 | QMAKE_INCDIR_QT = $(QTDIR)\include | 56 | QMAKE_INCDIR_QT = $(QTDIR)\include |
57 | QMAKE_LIBDIR_QT = $(QTDIR)\lib | 57 | QMAKE_LIBDIR_QT = $(QTDIR)\lib |
58 | 58 | ||
59 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src | 59 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src |
60 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< | 60 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< |
61 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src | 61 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src |
62 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< | 62 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< |
63 | 63 | ||
64 | QMAKE_LINK = link | 64 | QMAKE_LINK = link |
65 | QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA) | 65 | QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA) |
66 | QMAKE_LFLAGS_RELEASE= delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll | 66 | QMAKE_LFLAGS_RELEASE= delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll |
67 | QMAKE_LFLAGS_DEBUG= /DEBUG | 67 | QMAKE_LFLAGS_DEBUG= /DEBUG |
68 | QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:console | 68 | QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:console |
69 | QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:windows | 69 | QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:windows |
70 | QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL | 70 | QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL |
71 | QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL | 71 | QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL |
72 | QMAKE_LFLAGS_QT_DLL= /BASE:0x39D00000 | 72 | QMAKE_LFLAGS_QT_DLL= /BASE:0x39D00000 |
73 | 73 | ||
74 | QMAKE_LIBS = | 74 | QMAKE_LIBS = $(LIBS_EXTRA) |
75 | QMAKE_LIBS_CONSOLE= | 75 | QMAKE_LIBS_CONSOLE= |
76 | QMAKE_LIBS_WINDOWS= kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib | 76 | QMAKE_LIBS_WINDOWS= kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib |
77 | QMAKE_LIBS_QT = qt.lib | 77 | QMAKE_LIBS_QT = qt.lib |
78 | QMAKE_LIBS_QT_THREAD= qt-mt.lib | 78 | QMAKE_LIBS_QT_THREAD= qt-mt.lib |
79 | QMAKE_LIBS_QT_ENTRY= qtmain.lib | 79 | QMAKE_LIBS_QT_ENTRY= qtmain.lib |
80 | 80 | ||
81 | QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib delayimp.lib | 81 | QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib delayimp.lib |
82 | QMAKE_LFLAGS_OPENGL= /DELAYLOAD:opengl32.dll | 82 | QMAKE_LFLAGS_OPENGL= /DELAYLOAD:opengl32.dll |
83 | 83 | ||
84 | QMAKE_MOC = $(QTDIR)\bin\moc.exe | 84 | QMAKE_MOC = $(QTDIR)\bin\moc.exe |
85 | QMAKE_UIC = $(QTDIR)\bin\uic.exe | 85 | QMAKE_UIC = $(QTDIR)\bin\uic.exe |
86 | QMAKE_IDC = $(QTDIR)\bin\idc.exe | 86 | QMAKE_IDC = $(QTDIR)\bin\idc.exe |
87 | 87 | ||
88 | QMAKE_IDL = midl | 88 | QMAKE_IDL = midl |
89 | QMAKE_LIB = lib /NOLOGO | 89 | QMAKE_LIB = lib /NOLOGO |
90 | QMAKE_RC = rc | 90 | QMAKE_RC = rc |
91 | 91 | ||
92 | QMAKE_ZIP = zip -r -9 | 92 | QMAKE_ZIP = zip -r -9 |
93 | 93 | ||
94 | QMAKE_COPY = copy | 94 | QMAKE_COPY = copy |
95 | QMAKE_MOVE = move | 95 | QMAKE_MOVE = move |
96 | QMAKE_DEL_FILE = del | 96 | QMAKE_DEL_FILE = del |
97 | QMAKE_DEL_DIR = deltree | 97 | QMAKE_DEL_DIR = deltree |
98 | 98 | ||