Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes to watcom makefiles for OpenWatcom

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2003-04-05 10:14:07 +00:00
parent 6344162a81
commit ddea7eb614
104 changed files with 1219 additions and 25148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/samples/animate/makefile.wat
View File

@@ -6,9 +6,11 @@
# #
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
PROGRAM = anitest PROGRAM = anitest
OBJECTS = $(PROGRAM).obj animate.obj EXTRALIBS = $(WXDIR)\lib\anim_w.lib
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

5
contrib/samples/gizmos/multicell/makefile.wat
View File

@@ -3,9 +3,10 @@
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
PROGRAM = mtest PROGRAM = mtest
OBJECTS = $(PROGRAM).obj ..\src\multicell.obj EXTRALIBS = $(WXDIR)\lib\gizmos_w.lib
EXTRAINC=-I..\include OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

15
contrib/samples/gizmos/splittree/makefile.wat
View File

@@ -1,14 +1,13 @@
# # Purpose: makefile for multicell example (Watcom)
# Makefile for WATCOM # Created 2000-07-28
#
# Created by Julian Smart, January 1999
#
#
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
PROGRAM = minimal EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
OBJECTS = $(PROGRAM).obj
PROGRAM = tree
EXTRALIBS = $(WXDIR)\lib\gizmos_w.lib
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

2
contrib/samples/mmedia/makefile.wat
View File

@@ -8,7 +8,7 @@
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
PROGRAM = mmboard PROGRAM = mmboard
OBJECTS = $(PROGRAM).obj mmbman.obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj mmbman.obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

6
contrib/samples/ogl/ogledit/makefile.wat
View File

@@ -7,9 +7,11 @@
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
PROGRAM = ogledit PROGRAM = ogledit
EXTRALIBS = $(WXDIR)\lib\ogl.lib EXTRALIBS = $(WXDIR)\lib\ogl_w.lib
OBJECTS = $(PROGRAM).obj doc.obj view.obj palette.obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj $(OUTPUTDIR)\doc.obj $(OUTPUTDIR)\view.obj $(OUTPUTDIR)\palette.obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

16
contrib/samples/ogl/studio/makefile.wat
View File

@@ -7,10 +7,20 @@
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
PROGRAM = studio PROGRAM = studio
EXTRALIBS = $(WXDIR)\lib\ogl.lib EXTRALIBS = $(WXDIR)\lib\ogl_w.lib
OBJECTS = $(PROGRAM).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj & OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj &
mainfrm.obj project.obj dialogs.obj csprint.obj $(OUTPUTDIR)\doc.obj &
$(OUTPUTDIR)\shapes.obj &
$(OUTPUTDIR)\symbols.obj &
$(OUTPUTDIR)\view.obj &
$(OUTPUTDIR)\cspalette.obj &
$(OUTPUTDIR)\mainfrm.obj &
$(OUTPUTDIR)\project.obj &
$(OUTPUTDIR)\dialogs.obj &
$(OUTPUTDIR)\csprint.obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

16
contrib/samples/stc/makefile.wat
View File

@@ -1,17 +1,13 @@
# # Purpose: makefile for SVG example (Watcom)
# Makefile for WATCOM # Created 2000-07-28
#
WXDIR = $(%WXWIN)
WXDIR = $(WXWIN)
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
THISDIR = $(WXDIR)\contrib\samples\stc
OUTPUTDIR = $(THISDIR)\
PROGRAM = stctest PROGRAM = stctest
EXTRALIBS = $(WXDIR)\lib\stc.lib EXTRALIBS = $(WXDIR)\lib\stc_w.lib
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

14
contrib/samples/svg/makefile.wat
View File

@@ -1,17 +1,13 @@
# # Purpose: makefile for SVG example (Watcom)
# Makefile for WATCOM # Created 2000-07-28
#
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
THISDIR = $(WXDIR)\contrib\samples\svg
OUTPUTDIR = $(THISDIR)\
PROGRAM = svgtest PROGRAM = svgtest
EXTRALIBS = $(WXDIR)\lib\svg.lib EXTRALIBS = $(WXDIR)\lib\svg_w.lib
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

43
contrib/src/applet/makefile
View File

@@ -1,32 +1,27 @@
############################################################################# # Generated automatically from Makefile.in by configure.
# # $Id$
# Copyright (C) 1999 SciTech Software
# All rights reserved.
#
# Descripton: Generic makefile for the SciTech wxApplet library
#
#############################################################################
# We are building with the Win32 version top_srcdir = ../../..
top_builddir = ../../..
libsrc_dir = contrib/src/applet
USE_RTTI := 1 TARGET_LIBNAME=libwx_msw_applet-2.5
USE_CPPEXCEPT := 1
PRECOMP_HDR := wx/wxprec.h
CFLAGS += -D__WIN95__ -D__WXMSW__ -D__WINDOWS__
# Link with wxWindows static link libraries or with the DLL. DLL is default. LIBVERSION_CURRENT=0
LIBVERSION_REVISION=0
LIBVERSION_AGE=0
.IF $(STATIC_LINK)
.ELSE
CFLAGS += -DWXUSINGDLL
.ENDIF
# Define the library name and objects HEADER_PATH=$(top_srcdir)/contrib/include/wx
HEADER_SUBDIR=applet
LIBFILE = wxapplet$L HEADERS=applet.h appletwindow.h
LIBCLEAN = *.il? *.dll *.lib
OBJECTS := applet$O appletwindow$O
DEPEND_OBJ = $(OBJECTS) OBJECTS=applet.o appletwindow.o
.INCLUDE: "$(SCITECH)\makedefs\common.mk" DEPFILES=$(OBJECTS:.o=.d)
APPEXTRADEFS=-I$(top_srcdir)/contrib/include
include $(top_builddir)/src/makelib.env
-include $(DEPFILES)

25
contrib/src/gizmos/makefile.wat
View File

@@ -1,24 +1,17 @@
# Gizmos makefile for Watcom C++ # Gizmos makefile for Watcom C++
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
WXDIR = ..\..\.. WXDIR = ..\..\..
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
!include $(WXDIR)\src\makewat.env LIBTARGET = $(WXDIR)\lib\gizmos_w.lib
GIZMOSLIB = $(WXDIR)\lib\gizmos.lib OBJECTS = &
THISDIR = $(WXDIR)\contrib\src\gizmos $(OUTPUTDIR)\multicell.obj &
OUTPUTDIR = $(THISDIR)\ $(OUTPUTDIR)\splittree.obj &
$(OUTPUTDIR)\editlbox.obj &
$(OUTPUTDIR)\dynamicsash.obj &
$(OUTPUTDIR)\ledctrl.obj
NAME = gizmos !include $(WXDIR)\src\makelib.wat
LNK = $(name).lnk
OBJECTS = multicell.obj splittree.obj editlbox.obj dynamicsash.obj ledctrl.obj
all: $(GIZMOSLIB) .SYMBOLIC
$(GIZMOSLIB): $(OBJECTS)
*wlib /b /c /n /P=256 $(GIZMOSLIB) $(OBJECTS)
clean: .SYMBOLIC
-erase *.obj *.bak *.err *.pch $(GIZMOSLIB) *.lbc

32
contrib/src/mmedia/makefile.wat
View File

@@ -6,15 +6,33 @@
# #
# Makefile : Builds MMedia library for Watcom C++, WIN32 # Makefile : Builds MMedia library for Watcom C++, WIN32
WXDIR = $(%WXWIN) !error This will not work - there is no digitalv.h in Open Watcom as of 26 Feb 03
LIBTARGET=$(WXDIR)\contrib\lib\mmedia.lib WXDIR = ..\..\..
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
OBJECTS = cdbase.obj cdwin.obj g711.obj g721.obj g723_24.obj & LIBTARGET=$(WXDIR)\lib\mmedia_w.lib
g723_40.obj g72x.obj sndaiff.obj sndbase.obj sndcodec.obj &
sndcpcm.obj sndfile.obj sndg72x.obj sndpcm.obj sndulaw.obj & OBJECTS = &
sndwav.obj sndwin.obj vidbase.obj vidwin.obj $(OUTPUTDIR)\cdbase.obj &
$(OUTPUTDIR)\cdwin.obj &
$(OUTPUTDIR)\g711.obj &
$(OUTPUTDIR)\g721.obj &
$(OUTPUTDIR)\g723_24.obj &
$(OUTPUTDIR)\g723_40.obj &
$(OUTPUTDIR)\g72x.obj &
$(OUTPUTDIR)\sndaiff.obj &
$(OUTPUTDIR)\sndbase.obj &
$(OUTPUTDIR)\sndcodec.obj &
$(OUTPUTDIR)\sndcpcm.obj &
$(OUTPUTDIR)\sndfile.obj &
$(OUTPUTDIR)\sndg72x.obj &
$(OUTPUTDIR)\sndpcm.obj &
$(OUTPUTDIR)\sndulaw.obj &
$(OUTPUTDIR)\sndwav.obj &
$(OUTPUTDIR)\sndwin.obj &
$(OUTPUTDIR)\vidbase.obj &
$(OUTPUTDIR)\vidwin.obj
!include $(WXDIR)\src\makelib.wat !include $(WXDIR)\src\makelib.wat

33
contrib/src/ogl/makefile.wat
View File

@@ -1,25 +1,24 @@
# Objects makefile # OGL makefile
WXDIR = ..\..\.. WXDIR = ..\..\..
EXTRACPPFLAGS=-I$(WXDIR)\contrib\include;/DPROLOGIO EXTRACPPFLAGS=-I$(WXDIR)\contrib\include;/DPROLOGIO
!include $(WXDIR)\src\makewat.env LIBTARGET= $(WXDIR)\lib\ogl_w.lib
OGLLIB = $(WXDIR)\lib\ogl.lib OBJECTS = &
THISDIR = $(WXDIR)\contrib\src\ogl $(OUTPUTDIR)\basic.obj &
OUTPUTDIR = $(THISDIR)\ $(OUTPUTDIR)\basic2.obj &
$(OUTPUTDIR)\canvas.obj &
$(OUTPUTDIR)\lines.obj &
$(OUTPUTDIR)\divided.obj &
$(OUTPUTDIR)\constrnt.obj &
$(OUTPUTDIR)\composit.obj &
$(OUTPUTDIR)\drawn.obj &
$(OUTPUTDIR)\bmpshape.obj &
$(OUTPUTDIR)\mfutils.obj &
$(OUTPUTDIR)\ogldiag.obj &
$(OUTPUTDIR)\oglmisc.obj
NAME = ogl
LNK = $(name).lnk
OBJECTS = basic.obj basic2.obj canvas.obj lines.obj divided.obj constrnt.obj & !include $(WXDIR)\src\makelib.wat
composit.obj drawn.obj bmpshape.obj mfutils.obj ogldiag.obj oglmisc.obj
all: $(OGLLIB) .SYMBOLIC
$(OGLLIB): $(OBJECTS)
*wlib /b /c /n /P=256 $(OGLLIB) $(OBJECTS)
clean: .SYMBOLIC
-erase *.obj *.bak *.err *.pch $(OGLLIB) *.lbc

2
contrib/src/stc/makefile.wat
View File

@@ -10,7 +10,7 @@ EXTRACPPFLAGS = -I$(WXDIR)\contrib\include $(STCEXTRACPPFLAGS)
!include $(WXDIR)\src\makewat.env !include $(WXDIR)\src\makewat.env
STCLIB = $(WXDIR)\lib\stc.lib STCLIB = $(WXDIR)\lib\stc_w.lib
THISDIR = $(WXDIR)\contrib\src\stc THISDIR = $(WXDIR)\contrib\src\stc
OUTPUTDIR = $(THISDIR)\ OUTPUTDIR = $(THISDIR)\

23
contrib/src/svg/makefile.wat
View File

@@ -1,26 +1,13 @@
# svg makefile for Watcom C++ # SVG src makefile for Watcom C++
WXDIR = ..\..\.. WXDIR = ..\..\..
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
!include $(WXDIR)\src\makewat.env LIBTARGET = $(WXDIR)\lib\svg_w.lib
SVGLIB = $(WXDIR)\lib\svg.lib OBJECTS = &
THISDIR = $(WXDIR)\contrib\src\svg $(OUTPUTDIR)\dcsvg.obj &
OUTPUTDIR = $(THISDIR)\
NAME = svg !include $(WXDIR)\src\makelib.wat
LNK = $(name).lnk
OBJECTS = dcsvg.obj
all: $(SVGLIB) .SYMBOLIC
$(SVGLIB): $(OBJECTS)
*wlib /b /c /n /P=256 $(SVGLIB) $(OBJECTS)
clean: .SYMBOLIC
-erase *.obj *.bak *.err *.pch $(SVGLIB) *.lbc

65
contrib/src/xrc/makefile.wat
View File

@@ -2,30 +2,51 @@
WXDIR = ..\..\.. WXDIR = ..\..\..
EXTRACPPFLAGS=/Id:\libxml\libxml2-2.1.1 #XMLDIR=
!error modify makefile.wat to include the path to the XML library
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include;-I$(XMLDIR)\libxml2-2.1.1
!include $(WXDIR)\src\makewat.env !include $(WXDIR)\src\makewat.env
WXXMLLIB = $(WXDIR)\lib\wxxrc.lib LIBTARGET = $(WXDIR)\lib\wxxrc_w.lib
THISDIR = $(WXDIR)\contrib\src\xrc
NAME = wxxrc OBJECTS=&
LNK = $(name).lnk $(OUTPUTDIR)\xml.obj &
$(OUTPUTDIR)\xmlres.obj &
OBJECTS=xml.obj xmlres.obj xmlrsall.obj & $(OUTPUTDIR)\xmlrsall.obj &
xh_bttn.obj xh_chckb.obj xh_chckl.obj xh_choic.obj xh_combo.obj xh_dlg.obj & $(OUTPUTDIR)\xh_bttn.obj &
xh_gauge.obj xh_html.obj xh_menu.obj xh_notbk.obj xh_panel.obj xh_radbt.obj & $(OUTPUTDIR)\xh_chckb.obj &
xh_radbx.obj xh_sizer.obj xh_slidr.obj xh_spin.obj xh_stbmp.obj xh_sttxt.obj & $(OUTPUTDIR)\xh_chckl.obj &
xh_text.obj xh_listb.obj xh_toolb.obj xh_stlin.obj xh_bmp.obj & $(OUTPUTDIR)\xh_choic.obj &
xh_bmpbt.obj xh_cald.obj xh_listc.obj xh_scrol.obj xh_stbox.obj & $(OUTPUTDIR)\xh_combo.obj &
xh_tree.obj xh_unkwn.obj xh_frame.obj xh_scwin.obj xh_split.obj $(OUTPUTDIR)\xh_dlg.obj &
$(OUTPUTDIR)\xh_gauge.obj &
$(OUTPUTDIR)\xh_html.obj &
all: $(WXXMLLIB) $(OUTPUTDIR)\xh_menu.obj &
$(OUTPUTDIR)\xh_notbk.obj &
$(WXXMLLIB): $(OBJECTS) $(OUTPUTDIR)\xh_panel.obj &
*wlib /b /c /n /P=256 $(WXXMLLIB) $(OBJECTS) $(OUTPUTDIR)\xh_radbt.obj &
$(OUTPUTDIR)\xh_radbx.obj &
clean: .SYMBOLIC $(OUTPUTDIR)\xh_sizer.obj &
-erase *.obj *.bak *.err *.pch $(WXXMLLIB) *.lbc $(OUTPUTDIR)\xh_slidr.obj &
$(OUTPUTDIR)\xh_spin.obj &
$(OUTPUTDIR)\xh_stbmp.obj &
$(OUTPUTDIR)\xh_sttxt.obj &
$(OUTPUTDIR)\xh_text.obj &
$(OUTPUTDIR)\xh_listb.obj&
$(OUTPUTDIR)\xh_toolb.obj &
$(OUTPUTDIR)\xh_stlin.obj &
$(OUTPUTDIR)\xh_bmp.obj &
$(OUTPUTDIR)\xh_bmpbt.obj &
$(OUTPUTDIR)\xh_cald.obj &
$(OUTPUTDIR)\xh_listc.obj &
$(OUTPUTDIR)\xh_scrol.obj &
$(OUTPUTDIR)\xh_stbox.obj &
$(OUTPUTDIR)\xh_tree.obj &
$(OUTPUTDIR)\xh_unkwn.obj &
$(OUTPUTDIR)\xh_frame.obj &
$(OUTPUTDIR)\xh_scwin.obj &
$(OUTPUTDIR)\xh_split.obj
!include $(WXDIR)\src\makelib.wat

11
contrib/utils/convertrc/makefile.wat
View File

@@ -4,10 +4,17 @@
# #
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
THISDIR = $(WXDIR)\contrib\utils\convertrc
PROGRAM = wxconvert PROGRAM = wxconvert
EXTRALIBS = $(WXDIR)\lib\wxxrc.lib $(WXDIR)\lib\wxdeprecated.lib EXTRALIBS = $(WXDIR)\lib\wxxrc_w.lib $(WXDIR)\lib\wxdeprecated_w.lib
OBJECTS=convert.obj rc2xml.obj rc2wxr.obj wxr2xml.obj OBJECTS=&
$(OUTPUTDIR)\convert.obj &
$(OUTPUTDIR)\rc2xml.obj &
$(OUTPUTDIR)\rc2wxr.obj &
$(OUTPUTDIR)\wxr2xml.obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

6
contrib/utils/wxrc/makefile.wat
View File

@@ -4,10 +4,12 @@
# #
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
THISDIR = $(WXDIR)\contrib\utils\wxrc
PROGRAM = wxrc PROGRAM = wxrc
EXTRALIBS = $(WXDIR)\lib\wxxrc.lib EXTRALIBS = $(WXDIR)\lib\wxxrc_w.lib
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

16
contrib/utils/wxrcedit/makefile.wat
View File

@@ -4,10 +4,22 @@
# #
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
THISDIR = $(WXDIR)\contrib\utils\wxrcedit
PROGRAM = wxrcedit PROGRAM = wxrcedit
EXTRALIBS = $(WXDIR)\lib\wxxrc.lib EXTRALIBS = $(WXDIR)\lib\wxxrc_w.lib
OBJECTS=edapp.obj editor.obj nodehnd.obj xmlhelpr.obj preview.obj nodesdb.obj pe_basic.obj pe_adv.obj propedit.obj propframe.obj splittree.obj OBJECTS=$(OUTPUTDIR)\edapp.obj &
$(OUTPUTDIR)\editor.obj &
$(OUTPUTDIR)\nodehnd.obj &
$(OUTPUTDIR)\xmlhelpr.obj &
$(OUTPUTDIR)\preview.obj &
$(OUTPUTDIR)\nodesdb.obj &
$(OUTPUTDIR)\pe_basic.obj &
$(OUTPUTDIR)\pe_adv.obj &
$(OUTPUTDIR)\propedit.obj &
$(OUTPUTDIR)\propframe.obj &
$(OUTPUTDIR)\splittree.obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

14
distrib/msw/tmake/wat.t
View File

@@ -5,6 +5,7 @@
#! Author: Vadim Zeitlin #! Author: Vadim Zeitlin
#! Created: 14.07.99 #! Created: 14.07.99
#! Version: $Id$ #! Version: $Id$
#! Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
#!############################################################################# #!#############################################################################
#${ #${
#! include the code which parses filelist.txt file and initializes #! include the code which parses filelist.txt file and initializes
@@ -90,6 +91,7 @@ GENERICOBJS= #$ ExpandGlue("WXGENERICOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTD
NONESSENTIALOBJS= #$ ExpandGlue("WXNONESSENTIALOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\") NONESSENTIALOBJS= #$ ExpandGlue("WXNONESSENTIALOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")
COMMONOBJS = & COMMONOBJS = &
$(OUTPUTDIR)\y_tab.obj &
#$ ExpandGlue("WXCOMMONOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\") #$ ExpandGlue("WXCOMMONOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")
MSWOBJS = #$ ExpandGlue("WXMSWOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\") MSWOBJS = #$ ExpandGlue("WXMSWOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\")
@@ -110,7 +112,8 @@ $(ARCHINCDIR)\wx:
$(OUTPUTDIR): $(OUTPUTDIR):
@if not exist $^@ mkdir $^@ @if not exist $^@ mkdir $^@
$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h $(ARCHINCDIR)\wx $(SETUP_H): $(ARCHINCDIR)\wx
if not exist $(WXDIR)\include\wx\msw\setup.h copy $(WXDIR)\include\wx\msw\setup0.h $(WXDIR)\include\wx\msw\setup.h
copy $(WXDIR)\include\wx\msw\setup.h $@ copy $(WXDIR)\include\wx\msw\setup.h $@
LBCFILE=wx$(TOOLKIT).lbc LBCFILE=wx$(TOOLKIT).lbc
@@ -182,6 +185,15 @@ cleanall: clean
} }
#$} #$}
$(OUTPUTDIR)\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
*$(CC) $(CFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c
$(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c
copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
######################################################## ########################################################
# Generic objects (not always compiled, depending on # Generic objects (not always compiled, depending on
# whether platforms have native implementations) # whether platforms have native implementations)

4
include/wx/msw/private.h
View File

@@ -398,6 +398,9 @@ private:
DECLARE_NO_COPY_CLASS(SelectInHDC) DECLARE_NO_COPY_CLASS(SelectInHDC)
}; };
#ifdef __WATCOM__
//FIXME why does watcom dislike this ?? CE 05 April 2003
// when working with global pointers (which is unfortunately still necessary // when working with global pointers (which is unfortunately still necessary
// sometimes, e.g. for clipboard) it is important to unlock them exactly as // sometimes, e.g. for clipboard) it is important to unlock them exactly as
// many times as we lock them which just asks for using a "smart lock" class // many times as we lock them which just asks for using a "smart lock" class
@@ -437,6 +440,7 @@ private:
DECLARE_NO_COPY_CLASS(GlobalHandle) DECLARE_NO_COPY_CLASS(GlobalHandle)
}; };
#endif //__WATCOM__
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// macros to make casting between WXFOO and FOO a bit easier: the GetFoo() // macros to make casting between WXFOO and FOO a bit easier: the GetFoo()
// returns Foo cast to the Windows type for oruselves, while GetFooOf() takes // returns Foo cast to the Windows type for oruselves, while GetFooOf() takes

15
samples/artprov/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = artprov
PROGRAM = arttest OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
OBJECTS = $(PROGRAM).obj artbrows.obj #
!include $(%WXWIN)\src\makeprog.wat
!include $(WXDIR)\src\makeprog.wat

21
samples/calendar/makefile.wat
View File

@@ -1,11 +1,12 @@
# Purpose: makefile for calendar example (Watcom) #
# Created: 2000-01-03 # Makefile for WATCOM
#
WXDIR = $(%WXWIN) # Created by Julian Smart, January 1999
#
#
#
#
PROGRAM = calendar PROGRAM = calendar
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/caret/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = caret PROGRAM = caret
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/checklst/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = checklst PROGRAM = checklst
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

15
samples/config/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = config
PROGRAM = conftest OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
OBJECTS = $(PROGRAM).obj #
!include $(%WXWIN)\src\makeprog.wat
!include $(WXDIR)\src\makeprog.wat

18
samples/console/makefile.wat
View File

@@ -1,9 +1,13 @@
wxUSE_GUI = 0 #
OUTPUTDIR = Watcom\ # Makefile for WATCOM
#
# Created by Julian Smart, January 1999
#
#
#
wxUSE_GUI=0
#
PROGRAM = console PROGRAM = console
OBJECTS = $(OUTPUTDIR)$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(%WXWIN)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/controls/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = controls PROGRAM = controls
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

15
samples/db/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = db
PROGRAM = dbtest OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
OBJECTS = $(PROGRAM).obj listdb.obj #
!include $(%WXWIN)\src\makeprog.wat
!include $(WXDIR)\src\makeprog.wat

13
samples/dialogs/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = dialogs PROGRAM = dialogs
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/dnd/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = dnd PROGRAM = dnd
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/docview/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = docview PROGRAM = docview
OBJECTS = $(PROGRAM).obj view.obj doc.obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

15
samples/docvwmdi/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = docvwmdi
PROGRAM = docview OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
OBJECTS = $(PROGRAM).obj view.obj doc.obj #
!include $(%WXWIN)\src\makeprog.wat
!include $(WXDIR)\src\makeprog.wat

21
samples/dragimag/makefile.wat
View File

@@ -1,11 +1,12 @@
# Purpose: makefile for dragimag example (Watcom) #
# Created: 2000-03-15 # Makefile for WATCOM
#
WXDIR = $(%WXWIN) # Created by Julian Smart, January 1999
#
#
#
#
PROGRAM = dragimag PROGRAM = dragimag
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/drawing/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = drawing PROGRAM = drawing
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/erase/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = erase PROGRAM = erase
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

21
samples/event/makefile.wat
View File

@@ -1,11 +1,12 @@
# Purpose: makefile for event example (Watcom) #
# Created: 2001-01-31 # Makefile for WATCOM
#
WXDIR = $(%WXWIN) # Created by Julian Smart, January 1999
#
#
#
#
PROGRAM = event PROGRAM = event
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

21
samples/exec/makefile.wat
View File

@@ -1,11 +1,12 @@
# Purpose: makefile for exec example (Watcom) #
# Created: 2000-03-14 # Makefile for WATCOM
#
WXDIR = $(%WXWIN) # Created by Julian Smart, January 1999
#
#
#
#
PROGRAM = exec PROGRAM = exec
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/font/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = font PROGRAM = font
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

17
samples/grid/makefile.wat
View File

@@ -1,13 +1,12 @@
# #
# Makefile for WATCOM # Makefile for WATCOM
# #
# Created by Julian Smart, January 1999
# #
#
WXDIR = $(%WXWIN) #
#
PROGRAM = griddemo PROGRAM = grid
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

15
samples/help/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = help
PROGRAM = demo OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
OBJECTS = $(PROGRAM).obj #
!include $(%WXWIN)\src\makeprog.wat
!include $(WXDIR)\src\makeprog.wat

13
samples/html/about/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = about PROGRAM = about
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/html/help/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = help PROGRAM = help
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/html/helpview/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = helpview PROGRAM = helpview
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/html/printing/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = printing PROGRAM = printing
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/html/test/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = test PROGRAM = test
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/html/virtual/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = virtual PROGRAM = virtual
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/html/widget/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = widget PROGRAM = widget
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/html/zip/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = zip PROGRAM = zip
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/image/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = image PROGRAM = image
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/internat/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = internat PROGRAM = internat
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

2
samples/ipc/client.wat
View File

@@ -8,7 +8,7 @@
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
PROGRAM = client PROGRAM = client
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

2
samples/ipc/server.wat
View File

@@ -8,7 +8,7 @@
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
PROGRAM = server PROGRAM = server
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

21
samples/joytest/makefile.wat
View File

@@ -1,11 +1,12 @@
# Purpose: makefile for joytest example (Watcom) #
# Created: 2000-03-14 # Makefile for WATCOM
#
WXDIR = $(%WXWIN) # Created by Julian Smart, January 1999
#
#
#
#
PROGRAM = joytest PROGRAM = joytest
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/keyboard/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = keyboard PROGRAM = keyboard
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/layout/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = layout PROGRAM = layout
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/listctrl/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = listtest PROGRAM = listtest
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/mdi/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = mdi PROGRAM = mdi
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/memcheck/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = memcheck PROGRAM = memcheck
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/menu/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = menu PROGRAM = menu
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

47
samples/mfc/makefile.wat
View File

@@ -4,44 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = ..\.. #
PROGRAM = mfc
!include $(WXDIR)\src\makewat.env OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
WXLIB = $(WXDIR)\lib !include $(%WXWIN)\src\makeprog.wat
NAME = hello
LNK = $(name).lnk
OBJS = $(name).obj
# Required for multi-threaded MFC apps
EXTRACPPFLAGS = -bm -oaxt-zp4-ei-xs-zo-w3-bm-bt=nt -d_WINDOWS -d_MBCS
refmain = _wstart2_
PRECOMP=
all: $(name).exe
$(name).exe : $(OBJS) $(name).res $(LNK) $(WXLIB)\wx$(LEVEL).lib
wlink @$(LNK)
$(BINDCOMMAND) -d_MBCS $(name).res
$(name).res : $(name).rc $(WXDIR)\include\msw\wx.rc
$(RC) $(RESFLAGS1) $(name).rc
$(LNK) : makefile.wat
%create $(LNK)
@%append $(LNK) debug all
@%append $(LNK) system $(LINKOPTION)
@%append $(LNK) $(MINDATA)
@%append $(LNK) $(MAXDATA)
@%append $(LNK) $(STACK)
@%append $(LNK) name $(name)
@%append $(LNK) file $(WXLIB)\wx$(LEVEL).lib
@for %i in ($(EXTRALIBS)) do @%append $(LNK) file %i
@for %i in ($(OBJS)) do @%append $(LNK) file %i
clean: .SYMBOLIC
-erase *.obj *.bak *.err *.pch *.lib *.lnk *.res *.exe *.rex

21
samples/minifram/makefile.wat
View File

@@ -1,11 +1,12 @@
# Purpose: makefile for minifram example (Watcom) #
# Created: 2000-03-15 # Makefile for WATCOM
#
WXDIR = $(%WXWIN) # Created by Julian Smart, January 1999
#
#
#
#
PROGRAM = minifram PROGRAM = minifram
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

11
samples/minimal/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
OUTPUTDIR = Watcom\ #
PROGRAM = minimal PROGRAM = minimal
OBJECTS = $(OUTPUTDIR)$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(%WXWIN)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/nativdlg/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = nativdlg PROGRAM = nativdlg
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

21
samples/notebook/makefile.wat
View File

@@ -1,11 +1,12 @@
# Purpose: makefile for notebook example (Watcom) #
# Created: 2000-03-15 # Makefile for WATCOM
#
WXDIR = $(%WXWIN) # Created by Julian Smart, January 1999
#
#
#
#
PROGRAM = notebook PROGRAM = notebook
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/oleauto/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = oleauto PROGRAM = oleauto
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/ownerdrw/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = ownerdrw PROGRAM = ownerdrw
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

15
samples/png/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = png
PROGRAM = pngdemo OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
OBJECTS = $(PROGRAM).obj #
!include $(%WXWIN)\src\makeprog.wat
!include $(WXDIR)\src\makeprog.wat

13
samples/printing/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = printing PROGRAM = printing
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

21
samples/propsize/makefile.wat
View File

@@ -1,11 +1,12 @@
# Purpose: makefile for propsize example (Watcom) #
# Created: 2000-03-14 # Makefile for WATCOM
#
WXDIR = $(%WXWIN) # Created by Julian Smart, January 1999
#
#
#
#
PROGRAM = propsize PROGRAM = propsize
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/regtest/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = regtest PROGRAM = regtest
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

12
samples/resource/makefile.wat Normal file
View File

@@ -0,0 +1,12 @@
#
# Makefile for WATCOM
#
# Created by Julian Smart, January 1999
#
#
#
#
PROGRAM = resource
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(%WXWIN)\src\makeprog.wat

13
samples/rotate/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = rotate PROGRAM = rotate
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

21
samples/sashtest/makefile.wat
View File

@@ -1,11 +1,12 @@
# Purpose: makefile for sashtest example (Watcom) #
# Created: 2000-03-14 # Makefile for WATCOM
#
WXDIR = $(%WXWIN) # Created by Julian Smart, January 1999
#
#
#
#
PROGRAM = sashtest PROGRAM = sashtest
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/scroll/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = scroll PROGRAM = scroll
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/scrollsub/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = scrollsub PROGRAM = scrollsub
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

2
samples/sockets/client.wat
View File

@@ -8,7 +8,7 @@
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
PROGRAM = client PROGRAM = client
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

2
samples/sockets/server.wat
View File

@@ -8,7 +8,7 @@
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
PROGRAM = server PROGRAM = server
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

21
samples/splitter/makefile.wat
View File

@@ -1,11 +1,12 @@
# Purpose: makefile for splitter example (Watcom) #
# Created: 2000-03-15 # Makefile for WATCOM
#
WXDIR = $(%WXWIN) # Created by Julian Smart, January 1999
#
#
#
#
PROGRAM = splitter PROGRAM = splitter
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

21
samples/statbar/makefile.wat
View File

@@ -1,11 +1,12 @@
# Purpose: makefile for statbar example (Watcom) #
# Created: 2000-02-04 # Makefile for WATCOM
#
WXDIR = $(%WXWIN) # Created by Julian Smart, January 1999
#
#
#
#
PROGRAM = statbar PROGRAM = statbar
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

16
samples/stc/makefile.wat
View File

@@ -1,17 +1,13 @@
# # Purpose: makefile for SVG example (Watcom)
# Makefile for WATCOM # Created 2000-07-28
#
WXDIR = $(%WXWIN)
WXDIR = $(WXWIN)
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
THISDIR = $(WXDIR)\contrib\samples\stc
OUTPUTDIR = $(THISDIR)\
PROGRAM = stctest PROGRAM = stctest
EXTRALIBS = $(WXDIR)\lib\stc.lib EXTRALIBS = $(WXDIR)\lib\stc_w.lib
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

14
samples/svg/makefile.wat
View File

@@ -1,17 +1,13 @@
# # Purpose: makefile for SVG example (Watcom)
# Makefile for WATCOM # Created 2000-07-28
#
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
THISDIR = $(WXDIR)\contrib\samples\svg
OUTPUTDIR = $(THISDIR)\
PROGRAM = svgtest PROGRAM = svgtest
EXTRALIBS = $(WXDIR)\lib\svg.lib EXTRALIBS = $(WXDIR)\lib\svg_w.lib
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

21
samples/tab/makefile.wat
View File

@@ -1,11 +1,12 @@
# Purpose: makefile for tab example (Watcom) #
# Created: 2000-03-15 # Makefile for WATCOM
#
WXDIR = $(%WXWIN) # Created by Julian Smart, January 1999
#
#
#
#
PROGRAM = tab PROGRAM = tab
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

15
samples/taskbar/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = taskbar
PROGRAM = tbtest OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
OBJECTS = $(PROGRAM).obj #
!include $(%WXWIN)\src\makeprog.wat
!include $(WXDIR)\src\makeprog.wat

13
samples/text/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = text PROGRAM = text
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

21
samples/thread/makefile.wat
View File

@@ -1,11 +1,12 @@
# Purpose: makefile for thread example (Watcom) #
# Created: 2000-03-15 # Makefile for WATCOM
#
WXDIR = $(%WXWIN) # Created by Julian Smart, January 1999
#
#
#
#
PROGRAM = thread PROGRAM = thread
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

21
samples/toolbar/makefile.wat
View File

@@ -1,11 +1,12 @@
# Purpose: makefile for toolbar example (Watcom) #
# Created: 2000-03-14 # Makefile for WATCOM
#
WXDIR = $(%WXWIN) # Created by Julian Smart, January 1999
#
#
#
#
PROGRAM = toolbar PROGRAM = toolbar
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

21
samples/treectrl/makefile.wat
View File

@@ -1,11 +1,12 @@
# Purpose: makefile for treectrl example (Watcom) #
# Created: 2000-03-15 # Makefile for WATCOM
#
WXDIR = $(%WXWIN) # Created by Julian Smart, January 1999
#
#
#
#
PROGRAM = treetest PROGRAM = treetest
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

21
samples/typetest/makefile.wat
View File

@@ -1,11 +1,12 @@
# Purpose: makefile for typetest example (Watcom) #
# Created: 2000-03-14 # Makefile for WATCOM
#
WXDIR = $(%WXWIN) # Created by Julian Smart, January 1999
#
#
#
#
PROGRAM = typetest PROGRAM = typetest
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

21
samples/validate/makefile.wat
View File

@@ -1,11 +1,12 @@
# Purpose: makefile for validate example (Watcom) #
# Created: 2000-03-14 # Makefile for WATCOM
#
WXDIR = $(%WXWIN) # Created by Julian Smart, January 1999
#
#
#
#
PROGRAM = validate PROGRAM = validate
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

13
samples/widgets/makefile.wat
View File

@@ -4,12 +4,9 @@
# Created by Julian Smart, January 1999 # Created by Julian Smart, January 1999
# #
# #
#
WXDIR = $(%WXWIN) #
PROGRAM = widgets PROGRAM = widgets
OBJECTS = $(PROGRAM).obj button.obj combobox.obj gauge.obj listbox.obj notebook.obj radiobox.obj slider.obj spinbtn.obj static.obj textctrl.obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

21
samples/wizard/makefile.wat
View File

@@ -1,11 +1,12 @@
# Purpose: makefile for wizard example (Watcom) #
# Created: 2000-03-15 # Makefile for WATCOM
#
WXDIR = $(%WXWIN) # Created by Julian Smart, January 1999
#
#
#
#
PROGRAM = wizard PROGRAM = wizard
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
#
!include $(WXDIR)\src\makeprog.wat !include $(%WXWIN)\src\makeprog.wat

103
src/jpeg/makefile.wat
View File

@@ -3,6 +3,7 @@
# File: makefile.wat # File: makefile.wat
# Author: Julian Smart # Author: Julian Smart
# Created: 1998 # Created: 1998
# Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
# #
# Makefile : Builds JPEG library for Watcom C++, WIN32 # Makefile : Builds JPEG library for Watcom C++, WIN32
@@ -17,58 +18,58 @@ LIBTARGET = $(WXLIB)\jpeg$(WATCOM_SUFFIX).lib
# library object files common to compression and decompression # library object files common to compression and decompression
COMOBJECTS = & COMOBJECTS = &
$(OUTPUTDIR)jcomapi.obj & $(OUTPUTDIR)\jcomapi.obj &
$(OUTPUTDIR)jutils.obj & $(OUTPUTDIR)\jutils.obj &
$(OUTPUTDIR)jerror.obj & $(OUTPUTDIR)\jerror.obj &
$(OUTPUTDIR)jmemmgr.obj & $(OUTPUTDIR)\jmemmgr.obj &
$(OUTPUTDIR)jmemnobs.obj $(OUTPUTDIR)\jmemnobs.obj
# compression library object files # compression library object files
CLIBOBJECTS = & CLIBOBJECTS = &
$(OUTPUTDIR)jcapimin.obj & $(OUTPUTDIR)\jcapimin.obj &
$(OUTPUTDIR)jcapistd.obj & $(OUTPUTDIR)\jcapistd.obj &
$(OUTPUTDIR)jctrans.obj & $(OUTPUTDIR)\jctrans.obj &
$(OUTPUTDIR)jcparam.obj & $(OUTPUTDIR)\jcparam.obj &
$(OUTPUTDIR)jdatadst.obj & $(OUTPUTDIR)\jdatadst.obj &
$(OUTPUTDIR)jcinit.obj & $(OUTPUTDIR)\jcinit.obj &
$(OUTPUTDIR)jcmaster.obj & $(OUTPUTDIR)\jcmaster.obj &
$(OUTPUTDIR)jcmarker.obj & $(OUTPUTDIR)\jcmarker.obj &
$(OUTPUTDIR)jcmainct.obj & $(OUTPUTDIR)\jcmainct.obj &
$(OUTPUTDIR)jcprepct.obj & $(OUTPUTDIR)\jcprepct.obj &
$(OUTPUTDIR)jccoefct.obj & $(OUTPUTDIR)\jccoefct.obj &
$(OUTPUTDIR)jccolor.obj & $(OUTPUTDIR)\jccolor.obj &
$(OUTPUTDIR)jcsample.obj & $(OUTPUTDIR)\jcsample.obj &
$(OUTPUTDIR)jchuff.obj & $(OUTPUTDIR)\jchuff.obj &
$(OUTPUTDIR)jcphuff.obj & $(OUTPUTDIR)\jcphuff.obj &
$(OUTPUTDIR)jcdctmgr.obj & $(OUTPUTDIR)\jcdctmgr.obj &
$(OUTPUTDIR)jfdctfst.obj & $(OUTPUTDIR)\jfdctfst.obj &
$(OUTPUTDIR)jfdctflt.obj & $(OUTPUTDIR)\jfdctflt.obj &
$(OUTPUTDIR)jfdctint.obj $(OUTPUTDIR)\jfdctint.obj
# decompression library object files # decompression library object files
DLIBOBJECTS = & DLIBOBJECTS = &
$(OUTPUTDIR)jdapimin.obj & $(OUTPUTDIR)\jdapimin.obj &
$(OUTPUTDIR)jdapistd.obj & $(OUTPUTDIR)\jdapistd.obj &
$(OUTPUTDIR)jdtrans.obj & $(OUTPUTDIR)\jdtrans.obj &
$(OUTPUTDIR)jdatasrc.obj & $(OUTPUTDIR)\jdatasrc.obj &
$(OUTPUTDIR)jdmaster.obj & $(OUTPUTDIR)\jdmaster.obj &
$(OUTPUTDIR)jdinput.obj & $(OUTPUTDIR)\jdinput.obj &
$(OUTPUTDIR)jdmarker.obj & $(OUTPUTDIR)\jdmarker.obj &
$(OUTPUTDIR)jdhuff.obj & $(OUTPUTDIR)\jdhuff.obj &
$(OUTPUTDIR)jdphuff.obj & $(OUTPUTDIR)\jdphuff.obj &
$(OUTPUTDIR)jdmainct.obj & $(OUTPUTDIR)\jdmainct.obj &
$(OUTPUTDIR)jdcoefct.obj & $(OUTPUTDIR)\jdcoefct.obj &
$(OUTPUTDIR)jdpostct.obj & $(OUTPUTDIR)\jdpostct.obj &
$(OUTPUTDIR)jddctmgr.obj & $(OUTPUTDIR)\jddctmgr.obj &
$(OUTPUTDIR)jidctfst.obj & $(OUTPUTDIR)\jidctfst.obj &
$(OUTPUTDIR)jidctflt.obj & $(OUTPUTDIR)\jidctflt.obj &
$(OUTPUTDIR)jidctint.obj & $(OUTPUTDIR)\jidctint.obj &
$(OUTPUTDIR)jidctred.obj & $(OUTPUTDIR)\jidctred.obj &
$(OUTPUTDIR)jdsample.obj & $(OUTPUTDIR)\jdsample.obj &
$(OUTPUTDIR)jdcolor.obj & $(OUTPUTDIR)\jdcolor.obj &
$(OUTPUTDIR)jquant1.obj & $(OUTPUTDIR)\jquant1.obj &
$(OUTPUTDIR)jquant2.obj & $(OUTPUTDIR)\jquant2.obj &
$(OUTPUTDIR)jdmerge.obj $(OUTPUTDIR)\jdmerge.obj
# These objectfiles are included in libjpeg.lib # These objectfiles are included in libjpeg.lib
OBJECTS = $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS) OBJECTS = $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS)
@@ -78,18 +79,18 @@ all: $(OUTPUTDIR) $(LIBTARGET) .SYMBOLIC
$(OUTPUTDIR): $(OUTPUTDIR):
@if not exist $^@ mkdir $^@ @if not exist $^@ mkdir $^@
LBCFILE=$(OUTPUTDIR)jpeg.lbc LBCFILE=$(OUTPUTDIR)\jpeg.lbc
$(LIBTARGET) : $(OBJECTS) $(LIBTARGET) : $(OBJECTS)
%create $(LBCFILE) %create $(LBCFILE)
@for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
wlib /q /b /c /n /p=512 $^@ @$(LBCFILE) wlib /q /b /c /n /p=512 $^@ @$(LBCFILE)
clean: .SYMBOLIC clean: .SYMBOLIC
-erase $(OUTPUTDIR)*.obj -erase $(OUTPUTDIR)\*.obj
-erase $(LIBTARGET) -erase $(LIBTARGET)
-erase $(OUTPUTDIR)*.pch -erase $(OUTPUTDIR)\*.pch
-erase $(OUTPUTDIR)*.err -erase $(OUTPUTDIR)\*.err
-erase $(OUTPUTDIR)*.lbc -erase $(OUTPUTDIR)\*.lbc
cleanall: clean cleanall: clean

53
src/makelib.wat
View File

@@ -1,26 +1,57 @@
#
# Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
#
<<<<<<< makelib.wat
THISDIR = $+ $(%cdrive):$(%cwd) $-
# set OUTPUTDIR to the directory to be used for the .obj files created during
# the build (under $THISDIR)
!ifndef OUTPUTDIR
OUTPUTDIR=$(THISDIR)\$(BASEDIRPREFIX)$(CONFIGURATION)Watcom
# no trailing slash for win98
!endif
=======
OUTPUTDIR= $+ $(%cdrive):$(%cwd)\WATCOM $-
>>>>>>> 1.1.8.2
!include $(WXDIR)\src\makewat.env !include $(WXDIR)\src\makewat.env
<<<<<<< makelib.wat
all: $(OUTPUTDIR) $(LIBTARGET) all: $(OUTPUTDIR) $(LIBTARGET) .SYMBOLIC
=======
>>>>>>> 1.1.8.2
<<<<<<< makelib.wat
$(OUTPUTDIR): $(OUTPUTDIR):
@if not exist $^@ mkdir $^@ @if not exist $^@ mkdir $^@
=======
all: MAKDIR $(LIBTARGET) .SYMBOLIC
>>>>>>> 1.1.8.2
<<<<<<< makelib.wat
=======
MAKDIR: .SYMBOLIC
@if not exist $(OUTPUTDIR) mkdir $(OUTPUTDIR)
>>>>>>> 1.1.8.2
# the name of the file containing the objects to be put in the library # the name of the file containing the objects to be put in the library
LBCFILE=$(OUTPUTDIR)$(LIBTARGET).lbc LBCFILE=$(LIBTARGET).lbc
$(LIBTARGET) : $(OBJECTS) $(LIBTARGET) : $(OBJECTS)
%create $(LBCFILE) %create $(LBCFILE)
@for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
$(LIB) /b /c /n /p=512 $^@ @$(LBCFILE) $(LIB) /b /c /n /p=512 $^@ @$(LBCFILE)
clean: .SYMBOLIC clean: .SYMBOLIC
-erase $(OUTPUTDIR)*.obj -erase $(OUTPUTDIR)\*.obj
-erase $(OUTPUTDIR)*.bak -erase $(OUTPUTDIR)\*.bak
-erase $(OUTPUTDIR)*.err -erase $(OUTPUTDIR)\*.err
-erase $(OUTPUTDIR)*.pch -erase $(OUTPUTDIR)\*.pch
-erase $(OUTPUTDIR)*.lib -erase $(OUTPUTDIR)\*.lib
-erase $(OUTPUTDIR)*.lbc -erase $(OUTPUTDIR)\*.lbc
-erase $(OUTPUTDIR)*.res -erase $(OUTPUTDIR)\*.res
-erase $(OUTPUTDIR)*.exe -erase $(OUTPUTDIR)\*.exe
-erase $(OUTPUTDIR)*.lbc -erase $(OUTPUTDIR)\*.lbc
-erase $(LIBTARGET) -erase $(LIBTARGET)

46
src/makeprog.wat
View File

@@ -1,22 +1,36 @@
#
# Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
#
# $+ .. $- means we get the result directly
THISDIR = $+ $(%cdrive):$(%cwd) $-
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
!ifndef EXEDIR
OUTPUTDIR = $(THISDIR)\Watcom
!else
OUTPUTDIR = $(THISDIR)\$(EXEDIR)
!ifeq EXEDIR "."
OUTPUTDIR = $(THISDIR)
!endif
!endif
!include $(WXDIR)\src\makewat.env !include $(WXDIR)\src\makewat.env
WXLIB = $(WXDIR)\lib WXLIB = $(WXDIR)\lib
LNK = $(OUTPUTDIR)$(PROGRAM).lnk LNK = $(OUTPUTDIR)\$(PROGRAM).lnk
all: $(OUTPUTDIR) $(OUTPUTDIR)$(PROGRAM).exe $(EXTRATARGETS) .SYMBOLIC all: MAKEDIR $(OUTPUTDIR)\$(PROGRAM).exe $(EXTRATARGETS) .SYMBOLIC
$(OUTPUTDIR): MAKEDIR: .SYMBOLIC
@if not exist $^@ mkdir $^@ @if not exist $(OUTPUTDIR) mkdir $(OUTPUTDIR)
!ifeq wxUSE_GUI 0 !ifeq wxUSE_GUI 0
RESFILE= RESFILE=
!else !else
RESFILE=$(OUTPUTDIR)$(PROGRAM).res RESFILE=$(OUTPUTDIR)\$(PROGRAM).res
!endif !endif
$(OUTPUTDIR)$(PROGRAM).exe : $(OBJECTS) $(RESFILE) $(LNK) $(WXLIB)\$(LIBNAME).lib $(OUTPUTDIR)\$(PROGRAM).exe : $(OBJECTS) $(RESFILE) $(LNK) $(WXLIB)\$(LIBNAME).lib
wlink @$(LNK) wlink @$(LNK)
!ifneq wxUSE_GUI 0 !ifneq wxUSE_GUI 0
$(BINDCOMMAND) $(RESFILE) $(BINDCOMMAND) $(RESFILE)
@@ -27,26 +41,26 @@ $(RESFILE): $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
$(RC) $(RESFLAGS) /fo=$(RESFILE) $(PROGRAM).rc $(RC) $(RESFLAGS) /fo=$(RESFILE) $(PROGRAM).rc
!endif !endif
$(LNK) : makefile.wat $(LNK) : .SYMBOLIC
%create $(LNK) %create $(LNK)
@%append $(LNK) $(LDFLAGS) @%append $(LNK) $(LDFLAGS)
@%append $(LNK) $(DEBUGINFO) @%append $(LNK) $(DEBUGINFO)
@%append $(LNK) system $(LINKSYSTEM) @%append $(LNK) system $(LINKSYSTEM)
@%append $(LNK) $(STACK) @%append $(LNK) $(STACK)
@%append $(LNK) name $(OUTPUTDIR)$(PROGRAM).exe @%append $(LNK) name $(OUTPUTDIR)\$(PROGRAM).exe
@for %i in ($(OBJECTS)) do @%append $(LNK) file %i @for %i in ($(OBJECTS)) do @%append $(LNK) file %i
@for %i in ($(LIBS)) do @%append $(LNK) lib %i @for %i in ($(LIBS)) do @%append $(LNK) lib %i
@for %i in ($(EXTRALIBS)) do @%append $(LNK) lib %i @for %i in ($(EXTRALIBS)) do @%append $(LNK) lib %i
clean: .SYMBOLIC clean: .SYMBOLIC
-erase $(OUTPUTDIR)*.obj -erase $(OUTPUTDIR)\*.obj
-erase $(OUTPUTDIR)*.bak -erase $(OUTPUTDIR)\*.bak
-erase $(OUTPUTDIR)*.err -erase $(OUTPUTDIR)\*.err
-erase $(OUTPUTDIR)*.pch -erase $(OUTPUTDIR)\*.pch
-erase $(OUTPUTDIR)*.lib -erase $(OUTPUTDIR)\*.lib
-erase $(LNK) -erase $(LNK)
-erase $(OUTPUTDIR)*.res -erase $(OUTPUTDIR)\*.res
-erase $(OUTPUTDIR)*.exe -erase $(OUTPUTDIR)\*.exe
-erase $(OUTPUTDIR)*.lbc -erase $(OUTPUTDIR)\*.lbc
-rmdir $(OUTPUTDIR) -rmdir $(OUTPUTDIR)

13
src/makewat.env
View File

@@ -3,6 +3,7 @@
# Purpose: Watcom environments for wxWindows makefiles. # Purpose: Watcom environments for wxWindows makefiles.
# Author: Julian Smart and others # Author: Julian Smart and others
# Version: $Id$ # Version: $Id$
# Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
############################################################################### ###############################################################################
# The following environment variables must be set: # The following environment variables must be set:
@@ -33,8 +34,6 @@ WATCOM_SUFFIX=_w
WINVERFLAGS = /dWINVER=0x400 /d_WIN32_IE=0x0300 WINVERFLAGS = /dWINVER=0x400 /d_WIN32_IE=0x0300
# optimize for space/time: /os or /ot # optimize for space/time: /os or /ot
#
# NB: at least with OpenWatcom 1.0 using /ox leads to buggy code, don't use it
!ifeq FINAL 1 !ifeq FINAL 1
OPTFLAGS=/oails /5r OPTFLAGS=/oails /5r
!else !else
@@ -111,11 +110,12 @@ LIBPAGESIZE=/p=2048
# set OUTPUTDIR to the directory to be used for the .obj files created during # set OUTPUTDIR to the directory to be used for the .obj files created during
# the build (under $WXWIN) # the build (under $WXWIN)
!ifndef OUTPUTDIR !ifndef OUTPUTDIR
OUTPUTDIR=$(WXDIR)\$(BASEDIRPREFIX)$(CONFIGURATION)Watcom\ OUTPUTDIR=$(WXDIR)\$(BASEDIRPREFIX)$(CONFIGURATION)Watcom
# no trailing slash for win98
!endif !endif
!ifneq NOPRECOMP 1 !ifneq NOPRECOMP 1
PRECOMP = /fh=$(OUTPUTDIR)watcom.pch PRECOMP = /fh=$(OUTPUTDIR)\watcom.pch
!endif !endif
# the basename of the library # the basename of the library
@@ -153,7 +153,7 @@ RESFLAGS = -q -r -bt=nt /i$(WXDIR)\include /i$(WXDIR)\contrib\include $(WINVE
# NB: /bm switch is needed for thread-safe runtime, if you don't use # NB: /bm switch is needed for thread-safe runtime, if you don't use
# wxThread you may remove it # wxThread you may remove it
CPPFLAGS = /dWIN32 /bm /fo=$(OUTPUTDIR) /fr /zq $(IFLAGS) $(OPTFLAGS) $(WINVERFLAGS) $(EXTRACPPFLAGS) CPPFLAGS = /dWIN32 /bm /fo=$(OUTPUTDIR)\ /fr /zq $(IFLAGS) $(OPTFLAGS) $(WINVERFLAGS) $(EXTRACPPFLAGS)
!ifeq wxUSE_GUI 0 !ifeq wxUSE_GUI 0
CPPFLAGS += /dwxUSE_GUI=0 CPPFLAGS += /dwxUSE_GUI=0
!endif !endif
@@ -173,4 +173,5 @@ LDFLAGS = option eliminate, vfremoval
defaulttarget: all .SYMBOLIC defaulttarget: all .SYMBOLIC
erasepch: .SYMBOLIC erasepch: .SYMBOLIC
-erase $(OUTPUTDIR)watcom.pch -erase $(OUTPUTDIR)\watcom.pch

3
src/msw/makefile.wat
View File

@@ -354,7 +354,8 @@ $(ARCHINCDIR)\wx:
$(OUTPUTDIR): $(OUTPUTDIR):
@if not exist $^@ mkdir $^@ @if not exist $^@ mkdir $^@
$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h $(ARCHINCDIR)\wx $(SETUP_H): $(ARCHINCDIR)\wx
if not exist $(WXDIR)\include\wx\msw\setup.h copy $(WXDIR)\include\wx\msw\setup0.h $(WXDIR)\include\wx\msw\setup.h
copy $(WXDIR)\include\wx\msw\setup.h $@ copy $(WXDIR)\include\wx\msw\setup.h $@
LBCFILE=wx$(TOOLKIT).lbc LBCFILE=wx$(TOOLKIT).lbc

42
src/png/makefile.wat
View File

@@ -3,12 +3,12 @@
# File: makefile.wat # File: makefile.wat
# Author: Julian Smart # Author: Julian Smart
# Created: 1998 # Created: 1998
# Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
# #
# Makefile : Builds PNG library for Watcom C++, WIN32 # Makefile : Builds PNG library for Watcom C++, WIN32
WXDIR = ..\.. WXDIR = ..\..
EXTRACPPFLAGS=-i=..\zlib EXTRACPPFLAGS=-i=..\zlib
OUTPUTDIR=Watcom\
!include $(WXDIR)\src\makewat.env !include $(WXDIR)\src\makewat.env
@@ -17,39 +17,39 @@ WXLIB = $(WXDIR)\lib
LIBTARGET = $(WXLIB)\png$(WATCOM_SUFFIX).lib LIBTARGET = $(WXLIB)\png$(WATCOM_SUFFIX).lib
OBJECTS = & OBJECTS = &
$(OUTPUTDIR)png.obj & $(OUTPUTDIR)\png.obj &
$(OUTPUTDIR)pngread.obj & $(OUTPUTDIR)\pngread.obj &
$(OUTPUTDIR)pngrtran.obj & $(OUTPUTDIR)\pngrtran.obj &
$(OUTPUTDIR)pngrutil.obj & $(OUTPUTDIR)\pngrutil.obj &
$(OUTPUTDIR)pngpread.obj & $(OUTPUTDIR)\pngpread.obj &
$(OUTPUTDIR)pngtrans.obj & $(OUTPUTDIR)\pngtrans.obj &
$(OUTPUTDIR)pngwrite.obj & $(OUTPUTDIR)\pngwrite.obj &
$(OUTPUTDIR)pngwtran.obj & $(OUTPUTDIR)\pngwtran.obj &
$(OUTPUTDIR)pngwutil.obj & $(OUTPUTDIR)\pngwutil.obj &
$(OUTPUTDIR)pngerror.obj & $(OUTPUTDIR)\pngerror.obj &
$(OUTPUTDIR)pngmem.obj & $(OUTPUTDIR)\pngmem.obj &
$(OUTPUTDIR)pngwio.obj & $(OUTPUTDIR)\pngwio.obj &
$(OUTPUTDIR)pngrio.obj & $(OUTPUTDIR)\pngrio.obj &
$(OUTPUTDIR)pngget.obj & $(OUTPUTDIR)\pngget.obj &
$(OUTPUTDIR)pngset.obj $(OUTPUTDIR)\pngset.obj
all: $(OUTPUTDIR) $(LIBTARGET) .SYMBOLIC all: $(OUTPUTDIR) $(LIBTARGET) .SYMBOLIC
$(OUTPUTDIR): $(OUTPUTDIR):
@if not exist $^@ mkdir $^@ @if not exist $^@ mkdir $^@
LBCFILE=$(OUTPUTDIR)png.lbc LBCFILE=$(OUTPUTDIR)\png.lbc
$(LIBTARGET) : $(OBJECTS) $(LIBTARGET) : $(OBJECTS)
%create $(LBCFILE) %create $(LBCFILE)
@for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
wlib /q /b /c /n /p=512 $^@ @$(LBCFILE) wlib /q /b /c /n /p=512 $^@ @$(LBCFILE)
clean: .SYMBOLIC clean: .SYMBOLIC
-erase $(OUTPUTDIR)*.obj -erase $(OUTPUTDIR)\*.obj
-erase $(LIBTARGET) -erase $(LIBTARGET)
-erase $(OUTPUTDIR)*.pch -erase $(OUTPUTDIR)\*.pch
-erase $(OUTPUTDIR)*.err -erase $(OUTPUTDIR)\*.err
-erase $(OUTPUTDIR)*.lbc -erase $(OUTPUTDIR)\*.lbc
cleanall: clean cleanall: clean

13
src/regex/makefile.wat
View File

@@ -3,14 +3,13 @@
# File: makefile.wat # File: makefile.wat
# Author: Julian Smart # Author: Julian Smart
# Created: 1998 # Created: 1998
# Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
# #
# Makefile : Builds REGEX library for Watcom C++, WIN32 # Makefile : Builds REGEX library for Watcom C++, WIN32
WXDIR = ..\.. WXDIR = ..\..
EXTRACPPFLAGS=-DPOSIX_MISTAKE EXTRACPPFLAGS=-DPOSIX_MISTAKE
OUTPUTDIR=watcom\
!include $(WXDIR)\src\makewat.env !include $(WXDIR)\src\makewat.env
WXLIB = $(WXDIR)\lib WXLIB = $(WXDIR)\lib
@@ -18,17 +17,17 @@ WXLIB = $(WXDIR)\lib
LIBTARGET = $(WXLIB)\regex$(WATCOM_SUFFIX).lib LIBTARGET = $(WXLIB)\regex$(WATCOM_SUFFIX).lib
OBJECTS = & OBJECTS = &
$(OUTPUTDIR)regcomp.obj & $(OUTPUTDIR)\regcomp.obj &
$(OUTPUTDIR)regexec.obj & $(OUTPUTDIR)\regexec.obj &
$(OUTPUTDIR)regerror.obj & $(OUTPUTDIR)\regerror.obj &
$(OUTPUTDIR)regfree.obj $(OUTPUTDIR)\regfree.obj
all: $(OUTPUTDIR) $(LIBTARGET) .SYMBOLIC all: $(OUTPUTDIR) $(LIBTARGET) .SYMBOLIC
$(OUTPUTDIR): $(OUTPUTDIR):
@if not exist $^@ mkdir $^@ @if not exist $^@ mkdir $^@
LBCFILE=$(OUTPUTDIR)regex.lbc LBCFILE=$(OUTPUTDIR)\regex.lbc
$(LIBTARGET) : $(OBJECTS) $(LIBTARGET) : $(OBJECTS)
%create $(LBCFILE) %create $(LBCFILE)
@for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i

2
src/stc/makefile.wat
View File

@@ -10,7 +10,7 @@ EXTRACPPFLAGS = -I$(WXDIR)\contrib\include $(STCEXTRACPPFLAGS)
!include $(WXDIR)\src\makewat.env !include $(WXDIR)\src\makewat.env
STCLIB = $(WXDIR)\lib\stc.lib STCLIB = $(WXDIR)\lib\stc_w.lib
THISDIR = $(WXDIR)\contrib\src\stc THISDIR = $(WXDIR)\contrib\src\stc
OUTPUTDIR = $(THISDIR)\ OUTPUTDIR = $(THISDIR)\

71
src/tiff/makefile.wat
View File

@@ -3,6 +3,7 @@
# File: makefile.wat # File: makefile.wat
# Author: Julian Smart # Author: Julian Smart
# Created: 1998 # Created: 1998
# Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
# #
# Makefile : Builds TIFF library for Watcom C++, WIN32 # Makefile : Builds TIFF library for Watcom C++, WIN32
# This makefile has to rename files because apparently Watcom C++ # This makefile has to rename files because apparently Watcom C++
@@ -31,42 +32,42 @@ LIBTARGET = $(WXLIB)\tiff$(WATCOM_SUFFIX).lib
OBJECTS= & OBJECTS= &
!ifeq RENAME 1 !ifeq RENAME 1
$(OUTPUTDIR)_aux.obj & $(OUTPUTDIR)\_aux.obj &
!else !else
$(OUTPUTDIR)tif_aux.obj & $(OUTPUTDIR)\tif_aux.obj &
!endif !endif
$(OUTPUTDIR)$(TIFF)close.obj & $(OUTPUTDIR)\$(TIFF)close.obj &
$(OUTPUTDIR)$(TIFF)codec.obj & $(OUTPUTDIR)\$(TIFF)codec.obj &
$(OUTPUTDIR)$(TIFF)compress.obj & $(OUTPUTDIR)\$(TIFF)compress.obj &
$(OUTPUTDIR)$(TIFF)dir.obj & $(OUTPUTDIR)\$(TIFF)dir.obj &
$(OUTPUTDIR)$(TIFF)dirinfo.obj & $(OUTPUTDIR)\$(TIFF)dirinfo.obj &
$(OUTPUTDIR)$(TIFF)dirread.obj & $(OUTPUTDIR)\$(TIFF)dirread.obj &
$(OUTPUTDIR)$(TIFF)dirwrite.obj & $(OUTPUTDIR)\$(TIFF)dirwrite.obj &
$(OUTPUTDIR)$(TIFF)dumpmode.obj & $(OUTPUTDIR)\$(TIFF)dumpmode.obj &
$(OUTPUTDIR)$(TIFF)error.obj & $(OUTPUTDIR)\$(TIFF)error.obj &
$(OUTPUTDIR)$(TIFF)fax3.obj & $(OUTPUTDIR)\$(TIFF)fax3.obj &
$(OUTPUTDIR)$(TIFF)fax3sm.obj & $(OUTPUTDIR)\$(TIFF)fax3sm.obj &
$(OUTPUTDIR)$(TIFF)flush.obj & $(OUTPUTDIR)\$(TIFF)flush.obj &
$(OUTPUTDIR)$(TIFF)getimage.obj & $(OUTPUTDIR)\$(TIFF)getimage.obj &
$(OUTPUTDIR)$(TIFF)jpeg.obj & $(OUTPUTDIR)\$(TIFF)jpeg.obj &
$(OUTPUTDIR)$(TIFF)luv.obj & $(OUTPUTDIR)\$(TIFF)luv.obj &
$(OUTPUTDIR)$(TIFF)lzw.obj & $(OUTPUTDIR)\$(TIFF)lzw.obj &
$(OUTPUTDIR)$(TIFF)next.obj & $(OUTPUTDIR)\$(TIFF)next.obj &
$(OUTPUTDIR)$(TIFF)open.obj & $(OUTPUTDIR)\$(TIFF)open.obj &
$(OUTPUTDIR)$(TIFF)packbits.obj & $(OUTPUTDIR)\$(TIFF)packbits.obj &
$(OUTPUTDIR)$(TIFF)pixarlog.obj & $(OUTPUTDIR)\$(TIFF)pixarlog.obj &
$(OUTPUTDIR)$(TIFF)predict.obj & $(OUTPUTDIR)\$(TIFF)predict.obj &
$(OUTPUTDIR)$(TIFF)print.obj & $(OUTPUTDIR)\$(TIFF)print.obj &
$(OUTPUTDIR)$(TIFF)read.obj & $(OUTPUTDIR)\$(TIFF)read.obj &
$(OUTPUTDIR)$(TIFF)strip.obj & $(OUTPUTDIR)\$(TIFF)strip.obj &
$(OUTPUTDIR)$(TIFF)swab.obj & $(OUTPUTDIR)\$(TIFF)swab.obj &
$(OUTPUTDIR)$(TIFF)thunder.obj & $(OUTPUTDIR)\$(TIFF)thunder.obj &
$(OUTPUTDIR)$(TIFF)tile.obj & $(OUTPUTDIR)\$(TIFF)tile.obj &
$(OUTPUTDIR)$(TIFF)version.obj & $(OUTPUTDIR)\$(TIFF)version.obj &
$(OUTPUTDIR)$(TIFF)warning.obj & $(OUTPUTDIR)\$(TIFF)warning.obj &
$(OUTPUTDIR)$(TIFF)win32.obj & $(OUTPUTDIR)\$(TIFF)win32.obj &
$(OUTPUTDIR)$(TIFF)write.obj & $(OUTPUTDIR)\$(TIFF)write.obj &
$(OUTPUTDIR)$(TIFF)zip.obj $(OUTPUTDIR)\$(TIFF)zip.obj
all: $(OUTPUTDIR) $(RENAME) $(LIBTARGET) .SYMBOLIC all: $(OUTPUTDIR) $(RENAME) $(LIBTARGET) .SYMBOLIC
@@ -111,7 +112,7 @@ rename: .SYMBOLIC
$(OUTPUTDIR): $(OUTPUTDIR):
@if not exist $^@ mkdir $^@ @if not exist $^@ mkdir $^@
LBCFILE=$(OUTPUTDIR)tiff.lbc LBCFILE=$(OUTPUTDIR)\tiff.lbc
$(LIBTARGET) : $(OBJECTS) $(LIBTARGET) : $(OBJECTS)
%create $(LBCFILE) %create $(LBCFILE)
@for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i

Some files were not shown because too many files have changed in this diff Show More