1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/win32-watcom/qmake.conf b/mkspecs/win32-watcom/qmake.conf
index 1c4760f..fe6f3ed 100644
--- a/mkspecs/win32-watcom/qmake.conf
+++ b/mkspecs/win32-watcom/qmake.conf
@@ -1,65 +1,65 @@
 #
 # $Id$
 #
 # qmake configuration for Win32/Watcom C++
 #
        TEMPLATE        = app
        CONFIG          += qt warn_on release
        QMAKE_CC        = wcl386
        QMAKE_LEX       = flex
        QMAKE_LEXFLAGS  = 
        QMAKE_YACC      = byacc
        QMAKE_YACCFLAGS         = -d
        QMAKE_CFLAGS    = -zq $(CFLAGS_EXTRA)
        QMAKE_CFLAGS_WARN_ON= -w2
        QMAKE_CFLAGS_WARN_OFF= -w0
        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -ox)
        QMAKE_CFLAGS_DEBUG= -d2
        QMAKE_CFLAGS_YACC=
        QMAKE_CXX       = $$QMAKE_CC
        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
        QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
        QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
        QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
        QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
        QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
        QMAKE_INCDIR    =
        QMAKE_INCDIR_QT         = $(QTDIR)\include
        QMAKE_RUN_CC    = $(CC) -c $(CFLAGS) $(INCPATH) -fo=$obj $src
        QMAKE_RUN_CXX   = $(CXX) -c $(CXXFLAGS) $(INCPATH) -fo=$obj $src
        QMAKE_LINK      = wlink
        QMAKE_LFLAGS    = op quiet op c $(LFLAGS_EXTRA)
        QMAKE_LFLAGS_RELEASE=
        QMAKE_LFLAGS_DEBUG= d all
        QMAKE_LFLAGS_CONSOLE= sys nt
        QMAKE_LFLAGS_WINDOWS= sys nt_win
 QMAKE_LFLAGS_CONSOLE_DLL= sys nt
 QMAKE_LFLAGS_WINDOWS_DLL= sys nt_win
-        QMAKE_LIBS      =
+        QMAKE_LIBS      = $(LIBS_EXTRA)
        QMAKE_LIBS_CONSOLE=
        QMAKE_LIBS_WINDOWS=
        QMAKE_LIBS_QT   = %QTDIR%\lib\qt.lib
        QMAKE_LIBS_QT_ENTRY= %QTDIR%\lib\qtmain.lib
        QMAKE_LIBS_OPENGL= opengl32.lib
        QMAKE_MOC       = $(QTDIR)/bin/moc.exe
        QMAKE_UIC       = $(QTDIR)/bin/uic.exe
        QMAKE_IDC       = $(QTDIR)/bin/idc.exe
        QMAKE_LIB       = wlib -b -c -n -q -p=512
        QMAKE_RC        = rc
        QMAKE_ZIP       = zip -r -9
        QMAKE_COPY      = copy
        QMAKE_MOVE      = move
        QMAKE_DEL_FILE  = del
        QMAKE_DEL_DIR   = deltree

diff --git a/mkspecs/win32-watcom/qmake.conf b/mkspecs/win32-watcom/qmake.conf index 1c4760f..fe6f3ed 100644 --- a/mkspecs/win32-watcom/qmake.conf +++ b/mkspecs/win32-watcom/qmake.conf
@@ -1,65 +1,65 @@
1	#	1	#
2	# $Id$	2	# $Id$
3	#	3	#
4	# qmake configuration for Win32/Watcom C++	4	# qmake configuration for Win32/Watcom C++
5	#	5	#
6		6
7	TEMPLATE = app	7	TEMPLATE = app
8	CONFIG += qt warn_on release	8	CONFIG += qt warn_on release
9		9
10	QMAKE_CC = wcl386	10	QMAKE_CC = wcl386
11	QMAKE_LEX = flex	11	QMAKE_LEX = flex
12	QMAKE_LEXFLAGS =	12	QMAKE_LEXFLAGS =
13	QMAKE_YACC = byacc	13	QMAKE_YACC = byacc
14	QMAKE_YACCFLAGS = -d	14	QMAKE_YACCFLAGS = -d
15	QMAKE_CFLAGS = -zq $(CFLAGS_EXTRA)	15	QMAKE_CFLAGS = -zq $(CFLAGS_EXTRA)
16	QMAKE_CFLAGS_WARN_ON= -w2	16	QMAKE_CFLAGS_WARN_ON= -w2
17	QMAKE_CFLAGS_WARN_OFF= -w0	17	QMAKE_CFLAGS_WARN_OFF= -w0
18	QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -ox)	18	QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -ox)
19	QMAKE_CFLAGS_DEBUG= -d2	19	QMAKE_CFLAGS_DEBUG= -d2
20	QMAKE_CFLAGS_YACC=	20	QMAKE_CFLAGS_YACC=
21		21
22	QMAKE_CXX = $$QMAKE_CC	22	QMAKE_CXX = $$QMAKE_CC
23	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)	23	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
24	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON	24	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
25	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF	25	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
26	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE	26	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
27	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG	27	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
28	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC	28	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
29		29
30	QMAKE_INCDIR =	30	QMAKE_INCDIR =
31	QMAKE_INCDIR_QT = $(QTDIR)\include	31	QMAKE_INCDIR_QT = $(QTDIR)\include
32		32
33	QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -fo=$obj $src	33	QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -fo=$obj $src
34	QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -fo=$obj $src	34	QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -fo=$obj $src
35		35
36	QMAKE_LINK = wlink	36	QMAKE_LINK = wlink
37	QMAKE_LFLAGS = op quiet op c $(LFLAGS_EXTRA)	37	QMAKE_LFLAGS = op quiet op c $(LFLAGS_EXTRA)
38	QMAKE_LFLAGS_RELEASE=	38	QMAKE_LFLAGS_RELEASE=
39	QMAKE_LFLAGS_DEBUG= d all	39	QMAKE_LFLAGS_DEBUG= d all
40	QMAKE_LFLAGS_CONSOLE= sys nt	40	QMAKE_LFLAGS_CONSOLE= sys nt
41	QMAKE_LFLAGS_WINDOWS= sys nt_win	41	QMAKE_LFLAGS_WINDOWS= sys nt_win
42	QMAKE_LFLAGS_CONSOLE_DLL= sys nt	42	QMAKE_LFLAGS_CONSOLE_DLL= sys nt
43	QMAKE_LFLAGS_WINDOWS_DLL= sys nt_win	43	QMAKE_LFLAGS_WINDOWS_DLL= sys nt_win
44		44
45	QMAKE_LIBS =	45	QMAKE_LIBS = $(LIBS_EXTRA)
46	QMAKE_LIBS_CONSOLE=	46	QMAKE_LIBS_CONSOLE=
47	QMAKE_LIBS_WINDOWS=	47	QMAKE_LIBS_WINDOWS=
48	QMAKE_LIBS_QT = %QTDIR%\lib\qt.lib	48	QMAKE_LIBS_QT = %QTDIR%\lib\qt.lib
49	QMAKE_LIBS_QT_ENTRY= %QTDIR%\lib\qtmain.lib	49	QMAKE_LIBS_QT_ENTRY= %QTDIR%\lib\qtmain.lib
50		50
51	QMAKE_LIBS_OPENGL= opengl32.lib	51	QMAKE_LIBS_OPENGL= opengl32.lib
52		52
53	QMAKE_MOC = $(QTDIR)/bin/moc.exe	53	QMAKE_MOC = $(QTDIR)/bin/moc.exe
54	QMAKE_UIC = $(QTDIR)/bin/uic.exe	54	QMAKE_UIC = $(QTDIR)/bin/uic.exe
55	QMAKE_IDC = $(QTDIR)/bin/idc.exe	55	QMAKE_IDC = $(QTDIR)/bin/idc.exe
56		56
57	QMAKE_LIB = wlib -b -c -n -q -p=512	57	QMAKE_LIB = wlib -b -c -n -q -p=512
58	QMAKE_RC = rc	58	QMAKE_RC = rc
59		59
60	QMAKE_ZIP = zip -r -9	60	QMAKE_ZIP = zip -r -9
61		61
62	QMAKE_COPY = copy	62	QMAKE_COPY = copy
63	QMAKE_MOVE = move	63	QMAKE_MOVE = move
64	QMAKE_DEL_FILE = del	64	QMAKE_DEL_FILE = del
65	QMAKE_DEL_DIR = deltree	65	QMAKE_DEL_DIR = deltree