LIBTARGET = $(WXLIB)\wx.lib
DUMMY=dummydll
-ODBCLIB = ..\..\contrib\odbc\odbc32.lib
-
-EXTRATARGETS = # wxxpm
-EXTRATARGETSCLEAN = # clean_wxxpm
+# ODBCLIB = ..\..\contrib\odbc\odbc32.lib
+EXTRATARGETS = xpm png zlib
+EXTRATARGETSCLEAN = clean_xpm clean_png clean_zlib
GENDIR=$(WXDIR)\src\generic
COMMDIR=$(WXDIR)\src\common
XPMDIR=$(WXDIR)\src\xpm
gridg.obj &
laywin.obj &
panelg.obj &
+ prop.obj &
+ propform.obj &
+ proplist.obj &
sashwin.obj &
scrolwin.obj &
splitter.obj &
msgdlgg.obj &
helpxlp.obj &
colrdlgg.obj &
- fontdlgg.obj &
- postscrp.obj
+ fontdlgg.obj
COMMONOBJS = cmndata.obj &
config.obj &
layout.obj &
log.obj &
memory.obj &
+ mimetype.obj &
module.obj &
- odbc.obj &
object.obj &
prntbase.obj &
resource.obj &
variant.obj &
wincmn.obj
-# Can't compile this yet under Watcom C++
+# Can't compile these yet under Watcom C++
+# odbc.obj &
# db.obj &
# dbtable.obj &
-MSWOBJS1 = &
+MSWOBJS = &
accel.obj &
app.obj &
bitmap.obj &
palette.obj &
pen.obj &
penwin.obj &
- pnghand.obj &
printdlg.obj &
printwin.obj &
radiobox.obj &
utilsexc.obj &
wave.obj &
window.obj &
+ xpmhand.obj
+
+# pnghand.obj &
OLEOBJS = &
droptgt.obj &
uuid.obj &
automtn.obj
-XPMOBJECTS = crbuffri.obj&
- crdatfri.obj&
- create.obj crifrbuf.obj&
- crifrdat.obj&
- data.obj&
- hashtab.obj misc.obj&
- parse.obj rdftodat.obj&
- rdftoi.obj&
- rgb.obj scan.obj&
- simx.obj wrffrdat.obj&
- wrffrp.obj wrffri.obj
-
# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(OLEOBJS) # $(XPMOBJECTS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(OLEOBJS)
-all: $(OBJECTS) $(LIBTARGET)
+all: $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS)
$(LIBTARGET) : $(OBJECTS)
%create tmp.lbc
@for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
wlib /b /c /n /p=512 $^@ @tmp.lbc
+
+#test : $(OBJECTS)
+# %create tmp.lbc
+# @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
+# wlib /b /c /n /p=512 $^@ @tmp.lbc
+
-clean: .SYMBOLIC
+clean: .SYMBOLIC $(EXTRATARGETSCLEAN)
-erase *.obj
- -erase $(LIBLARGET)
+ -erase $(LIBTARGET)
-erase *.pch
+ -erase *.err
+ -erase *.lbc
cleanall: clean
gdiobj.obj: $(MSWDIR)\gdiobj.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+helpwin.obj: $(MSWDIR)\helpwin.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
icon.obj: $(MSWDIR)\icon.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
imaglist.obj: $(MSWDIR)\imaglist.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+iniconf.obj: $(MSWDIR)\iniconf.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
joystick.obj: $(MSWDIR)\joystick.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
window.obj: $(MSWDIR)\window.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+xpmhand.obj: $(MSWDIR)\xpmhand.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
droptgt.obj: $(OLEDIR)\droptgt.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
memory.obj: $(COMMDIR)\memory.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+mimetype.obj: $(COMMDIR)\mimetype.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
module.obj: $(COMMDIR)\module.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
odbc.obj: $(COMMDIR)\odbc.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-postscrp.obj: $(COMMDIR)\postcrp.cpp
- *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
prntbase.obj: $(COMMDIR)\prntbase.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
printps.obj: $(GENDIR)\printps.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+prop.obj: $(GENDIR)\prop.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+propform.obj: $(GENDIR)\propform.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+proplist.obj: $(GENDIR)\proplist.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
prntdlgg.obj: $(GENDIR)\prntdlgg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
wrffrp.obj: $(XPMDIR)\wrffrp.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
+OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
+ trees$(O)
+OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
+ infutil$(O) inffast$(O)
+
+adler32.obj: adler32.c zutil.h zlib.h zconf.h
+ $(CC) -c $(CFLAGS) $*.c
+
+compress.obj: compress.c zlib.h zconf.h
+ $(CC) -c $(CFLAGS) $*.c
+
+crc32.obj: crc32.c zutil.h zlib.h zconf.h
+ $(CC) -c $(CFLAGS) $*.c
+
+deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
+ $(CC) -c $(CFLAGS) $*.c
+
+gzio.obj: gzio.c zutil.h zlib.h zconf.h
+ $(CC) -c $(CFLAGS) $*.c
+
+infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h\
+ infcodes.h infutil.h
+ $(CC) -c $(CFLAGS) $*.c
+
+infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h\
+ infcodes.h inffast.h
+ $(CC) -c $(CFLAGS) $*.c
+
+inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h
+ $(CC) -c $(CFLAGS) $*.c
+
+inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+ $(CC) -c $(CFLAGS) $*.c
+
+infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
+ $(CC) -c $(CFLAGS) $*.c
+
+inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
+ $(CC) -c $(CFLAGS) $*.c
+
+trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h
+ $(CC) -c $(CFLAGS) $*.c
+
+uncompr.obj: uncompr.c zlib.h zconf.h
+ $(CC) -c $(CFLAGS) $*.c
+
+zutil.obj: zutil.c zutil.h zlib.h zconf.h
+ $(CC) -c $(CFLAGS) $*.c
+
+xpm: .SYMBOLIC
+ cd $(WXDIR)\src\xpm
+ wmake -f makefile.wat all
+ cd $(WXDIR)\src\msw
+
+clean_xpm: .SYMBOLIC
+ cd $(WXDIR)\src\xpm
+ wmake -f makefile.wat clean
+ cd $(WXDIR)\src\msw
+
+png: .SYMBOLIC
+ cd $(WXDIR)\src\png
+ wmake -f makefile.wat all
+ cd $(WXDIR)\src\msw
+
+clean_png: .SYMBOLIC
+ cd $(WXDIR)\src\png
+ wmake -f makefile.wat clean
+ cd $(WXDIR)\src\msw
-#wxxpm: .SYMBOLIC
-# cd $(WXDIR)\contrib\wxxpm
-# wmake -f makefile.wat all
-# cd $(WXDIR)\src\msw
+zlib: .SYMBOLIC
+ cd $(WXDIR)\src\zlib
+ wmake -f makefile.wat all
+ cd $(WXDIR)\src\msw
-#clean_wxxpm: .SYMBOLIC
-# cd $(WXDIR)\contrib\wxxpm
-# wmake -f makefile.wat clean
-# cd $(WXDIR)\src\msw
+clean_zlib: .SYMBOLIC
+ cd $(WXDIR)\src\zlib
+ wmake -f makefile.wat clean
+ cd $(WXDIR)\src\msw