X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68be9f090f422450d333385cf62c9b4d350674be..2fe212b0336512aac9eace69fab09ce856b0bf4b:/src/msw/makefile.g95?ds=sidebyside

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index df4e156f6b..8007666ac0 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 18:32, 2000/02/17
+# This file was automatically generated by tmake at 23:49, 2001/10/14
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -25,10 +25,10 @@ WXDLL = $(WXDIR)/lib/wx$(WXVERSION).dll
 WXDEF = wx$(WXVERSION).def
 DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \
                  $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \
-	              $(WXDIR)/lib/libxpm.a $(WXDIR)/lib/libtiff.a
+	             $(WXDIR)/lib/libtiff.a
 DLL_LDFLAGS = -L$(WXDIR)/lib
 DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
-             -luuid -lrpcrt4 -lodbc32 -lwinmm \
+             -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
              -lwsock32 $(DLL_EXTRA_LIBS) \
 	          -lstdc++
 endif
@@ -43,7 +43,6 @@ HTMLDIR = $(WXDIR)/src/html
 ZLIBDIR = $(WXDIR)/src/zlib
 PNGDIR  = $(WXDIR)/src/png
 JPEGDIR = $(WXDIR)/src/jpeg
-XPMDIR  = $(WXDIR)/src/xpm
 TIFFDIR = $(WXDIR)/src/tiff
 OLEDIR  = $(WXDIR)/src/msw/ole
 MSWDIR  = $(WXDIR)/src/msw
@@ -51,7 +50,6 @@ MSWDIR  = $(WXDIR)/src/msw
 ZLIBLIB = $(WXDIR)/lib/libzlib.a
 PNGLIB  = $(WXDIR)/lib/libpng.a
 JPEGLIB = $(WXDIR)/lib/libjpeg.a
-XPMLIB  = $(WXDIR)/lib/libxpm.a
 TIFFLIB = $(WXDIR)/lib/libtiff.a
 
 DOCDIR = $(WXDIR)/docs
@@ -72,24 +70,30 @@ GENERICOBJS = \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
 		$(GENDIR)/calctrl.$(OBJSUFF) \
 		$(GENDIR)/choicdgg.$(OBJSUFF) \
+		$(GENDIR)/dirctrlg.$(OBJSUFF) \
 		$(GENDIR)/dragimgg.$(OBJSUFF) \
 		$(GENDIR)/grid.$(OBJSUFF) \
+		$(GENDIR)/gridctrl.$(OBJSUFF) \
+		$(GENDIR)/gridsel.$(OBJSUFF) \
 		$(GENDIR)/laywin.$(OBJSUFF) \
 		$(GENDIR)/logg.$(OBJSUFF) \
 		$(GENDIR)/numdlgg.$(OBJSUFF) \
 		$(GENDIR)/panelg.$(OBJSUFF) \
-		$(GENDIR)/plot.$(OBJSUFF) \
 		$(GENDIR)/progdlgg.$(OBJSUFF) \
 		$(GENDIR)/prop.$(OBJSUFF) \
 		$(GENDIR)/propform.$(OBJSUFF) \
 		$(GENDIR)/proplist.$(OBJSUFF) \
 		$(GENDIR)/sashwin.$(OBJSUFF) \
-		$(GENDIR)/scrolwin.$(OBJSUFF) \
+		$(GENDIR)/scrlwing.$(OBJSUFF) \
+		$(GENDIR)/spinctlg.$(OBJSUFF) \
+		$(GENDIR)/splash.$(OBJSUFF) \
 		$(GENDIR)/splitter.$(OBJSUFF) \
 		$(GENDIR)/statusbr.$(OBJSUFF) \
 		$(GENDIR)/tbarsmpl.$(OBJSUFF) \
 		$(GENDIR)/textdlgg.$(OBJSUFF) \
 		$(GENDIR)/tipdlg.$(OBJSUFF) \
+		$(GENDIR)/tipwin.$(OBJSUFF) \
+		$(GENDIR)/treectlg.$(OBJSUFF) \
 		$(GENDIR)/treelay.$(OBJSUFF) \
 		$(GENDIR)/wizard.$(OBJSUFF)
 
@@ -98,16 +102,22 @@ COMMONOBJS  = \
 		$(COMMDIR)/appcmn.$(OBJSUFF) \
 		$(COMMDIR)/choiccmn.$(OBJSUFF) \
 		$(COMMDIR)/clipcmn.$(OBJSUFF) \
+		$(COMMDIR)/clntdata.$(OBJSUFF) \
 		$(COMMDIR)/cmdline.$(OBJSUFF) \
+		$(COMMDIR)/cmdproc.$(OBJSUFF) \
 		$(COMMDIR)/cmndata.$(OBJSUFF) \
 		$(COMMDIR)/config.$(OBJSUFF) \
+		$(COMMDIR)/containr.$(OBJSUFF) \
+		$(COMMDIR)/cshelp.$(OBJSUFF) \
 		$(COMMDIR)/ctrlcmn.$(OBJSUFF) \
 		$(COMMDIR)/ctrlsub.$(OBJSUFF) \
 		$(COMMDIR)/datetime.$(OBJSUFF) \
 		$(COMMDIR)/datstrm.$(OBJSUFF) \
 		$(COMMDIR)/db.$(OBJSUFF) \
+		$(COMMDIR)/dbgrid.$(OBJSUFF) \
 		$(COMMDIR)/dbtable.$(OBJSUFF) \
 		$(COMMDIR)/dcbase.$(OBJSUFF) \
+		$(COMMDIR)/dircmn.$(OBJSUFF) \
 		$(COMMDIR)/dlgcmn.$(OBJSUFF) \
 		$(COMMDIR)/dndcmn.$(OBJSUFF) \
 		$(COMMDIR)/dobjcmn.$(OBJSUFF) \
@@ -115,13 +125,16 @@ COMMONOBJS  = \
 		$(COMMDIR)/docview.$(OBJSUFF) \
 		$(COMMDIR)/dynarray.$(OBJSUFF) \
 		$(COMMDIR)/dynlib.$(OBJSUFF) \
+		$(COMMDIR)/effects.$(OBJSUFF) \
 		$(COMMDIR)/encconv.$(OBJSUFF) \
 		$(COMMDIR)/event.$(OBJSUFF) \
 		$(COMMDIR)/extended.$(OBJSUFF) \
+		$(COMMDIR)/fddlgcmn.$(OBJSUFF) \
 		$(COMMDIR)/ffile.$(OBJSUFF) \
 		$(COMMDIR)/file.$(OBJSUFF) \
 		$(COMMDIR)/fileconf.$(OBJSUFF) \
 		$(COMMDIR)/filefn.$(OBJSUFF) \
+		$(COMMDIR)/filename.$(OBJSUFF) \
 		$(COMMDIR)/filesys.$(OBJSUFF) \
 		$(COMMDIR)/fontcmn.$(OBJSUFF) \
 		$(COMMDIR)/fontmap.$(OBJSUFF) \
@@ -130,6 +143,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/fs_mem.$(OBJSUFF) \
 		$(COMMDIR)/fs_zip.$(OBJSUFF) \
 		$(COMMDIR)/ftp.$(OBJSUFF) \
+		$(COMMDIR)/gaugecmn.$(OBJSUFF) \
 		$(COMMDIR)/gdicmn.$(OBJSUFF) \
 		$(COMMDIR)/geometry.$(OBJSUFF) \
 		$(COMMDIR)/gifdecod.$(OBJSUFF) \
@@ -145,6 +159,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/imagpng.$(OBJSUFF) \
 		$(COMMDIR)/imagpnm.$(OBJSUFF) \
 		$(COMMDIR)/imagtiff.$(OBJSUFF) \
+		$(COMMDIR)/imagxpm.$(OBJSUFF) \
 		$(COMMDIR)/intl.$(OBJSUFF) \
 		$(COMMDIR)/ipcbase.$(OBJSUFF) \
 		$(COMMDIR)/layout.$(OBJSUFF) \
@@ -152,17 +167,23 @@ COMMONOBJS  = \
 		$(COMMDIR)/list.$(OBJSUFF) \
 		$(COMMDIR)/log.$(OBJSUFF) \
 		$(COMMDIR)/longlong.$(OBJSUFF) \
+		$(COMMDIR)/matrix.$(OBJSUFF) \
 		$(COMMDIR)/memory.$(OBJSUFF) \
 		$(COMMDIR)/menucmn.$(OBJSUFF) \
 		$(COMMDIR)/mimecmn.$(OBJSUFF) \
 		$(COMMDIR)/module.$(OBJSUFF) \
 		$(COMMDIR)/mstream.$(OBJSUFF) \
+		$(COMMDIR)/nbkbase.$(OBJSUFF) \
 		$(COMMDIR)/object.$(OBJSUFF) \
 		$(COMMDIR)/objstrm.$(OBJSUFF) \
 		$(COMMDIR)/paper.$(OBJSUFF) \
+		$(COMMDIR)/popupcmn.$(OBJSUFF) \
 		$(COMMDIR)/prntbase.$(OBJSUFF) \
 		$(COMMDIR)/process.$(OBJSUFF) \
 		$(COMMDIR)/protocol.$(OBJSUFF) \
+		$(COMMDIR)/quantize.$(OBJSUFF) \
+		$(COMMDIR)/radiocmn.$(OBJSUFF) \
+		$(COMMDIR)/regex.$(OBJSUFF) \
 		$(COMMDIR)/resource.$(OBJSUFF) \
 		$(COMMDIR)/sckaddr.$(OBJSUFF) \
 		$(COMMDIR)/sckfile.$(OBJSUFF) \
@@ -171,14 +192,18 @@ COMMONOBJS  = \
 		$(COMMDIR)/serbase.$(OBJSUFF) \
 		$(COMMDIR)/sizer.$(OBJSUFF) \
 		$(COMMDIR)/socket.$(OBJSUFF) \
+		$(COMMDIR)/statbar.$(OBJSUFF) \
 		$(COMMDIR)/strconv.$(OBJSUFF) \
 		$(COMMDIR)/stream.$(OBJSUFF) \
 		$(COMMDIR)/string.$(OBJSUFF) \
+		$(COMMDIR)/sysopt.$(OBJSUFF) \
 		$(COMMDIR)/tbarbase.$(OBJSUFF) \
 		$(COMMDIR)/textcmn.$(OBJSUFF) \
 		$(COMMDIR)/textfile.$(OBJSUFF) \
 		$(COMMDIR)/timercmn.$(OBJSUFF) \
 		$(COMMDIR)/tokenzr.$(OBJSUFF) \
+		$(COMMDIR)/toplvcmn.$(OBJSUFF) \
+		$(COMMDIR)/treebase.$(OBJSUFF) \
 		$(COMMDIR)/txtstrm.$(OBJSUFF) \
 		$(COMMDIR)/unzip.$(OBJSUFF) \
 		$(COMMDIR)/url.$(OBJSUFF) \
@@ -191,6 +216,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/wincmn.$(OBJSUFF) \
 		$(COMMDIR)/wxchar.$(OBJSUFF) \
 		$(COMMDIR)/wxexpr.$(OBJSUFF) \
+		$(COMMDIR)/xpmdecod.$(OBJSUFF) \
 		$(COMMDIR)/zipstrm.$(OBJSUFF) \
 		$(COMMDIR)/zstream.$(OBJSUFF)
 
@@ -248,6 +274,8 @@ MSWOBJS     = \
 		$(MSWDIR)/dir.$(OBJSUFF) \
 		$(MSWDIR)/dragimag.$(OBJSUFF) \
 		$(MSWDIR)/enhmeta.$(OBJSUFF) \
+		$(MSWDIR)/evtloop.$(OBJSUFF) \
+		$(MSWDIR)/fdrepdlg.$(OBJSUFF) \
 		$(MSWDIR)/filedlg.$(OBJSUFF) \
 		$(MSWDIR)/font.$(OBJSUFF) \
 		$(MSWDIR)/fontdlg.$(OBJSUFF) \
@@ -259,6 +287,9 @@ MSWOBJS     = \
 		$(MSWDIR)/gdiobj.$(OBJSUFF) \
 		$(MSWDIR)/glcanvas.$(OBJSUFF) \
 		$(MSWDIR)/gsocket.$(OBJSUFF) \
+		$(MSWDIR)/gsockmsw.$(OBJSUFF) \
+		$(MSWDIR)/helpbest.$(OBJSUFF) \
+		$(MSWDIR)/helpchm.$(OBJSUFF) \
 		$(MSWDIR)/helpwin.$(OBJSUFF) \
 		$(MSWDIR)/icon.$(OBJSUFF) \
 		$(MSWDIR)/imaglist.$(OBJSUFF) \
@@ -289,6 +320,7 @@ MSWOBJS     = \
 		$(MSWDIR)/scrolbar.$(OBJSUFF) \
 		$(MSWDIR)/settings.$(OBJSUFF) \
 		$(MSWDIR)/slider95.$(OBJSUFF) \
+		$(MSWDIR)/snglinst.$(OBJSUFF) \
 		$(MSWDIR)/spinbutt.$(OBJSUFF) \
 		$(MSWDIR)/spinctrl.$(OBJSUFF) \
 		$(MSWDIR)/statbmp.$(OBJSUFF) \
@@ -300,15 +332,16 @@ MSWOBJS     = \
 		$(MSWDIR)/taskbar.$(OBJSUFF) \
 		$(MSWDIR)/tbar95.$(OBJSUFF) \
 		$(MSWDIR)/textctrl.$(OBJSUFF) \
+		$(MSWDIR)/tglbtn.$(OBJSUFF) \
 		$(MSWDIR)/thread.$(OBJSUFF) \
 		$(MSWDIR)/timer.$(OBJSUFF) \
 		$(MSWDIR)/tooltip.$(OBJSUFF) \
+		$(MSWDIR)/toplevel.$(OBJSUFF) \
 		$(MSWDIR)/treectrl.$(OBJSUFF) \
 		$(MSWDIR)/utils.$(OBJSUFF) \
 		$(MSWDIR)/utilsexc.$(OBJSUFF) \
 		$(MSWDIR)/wave.$(OBJSUFF) \
-		$(MSWDIR)/window.$(OBJSUFF) \
-		$(MSWDIR)/xpmhand.$(OBJSUFF)
+		$(MSWDIR)/window.$(OBJSUFF)
 
 ADVANCEDOBJS     = \
 		$(COMMDIR)/odbc.$(OBJSUFF) \
@@ -401,26 +434,6 @@ JPEGOBJS    = \
 		$(JPEGDIR)/jquant2.$(OBJSUFF) \
 		$(JPEGDIR)/jdmerge.$(OBJSUFF)
 
-XPMOBJS =    $(XPMDIR)/attrib.o\
-		$(XPMDIR)/crbuffri.o\
-		$(XPMDIR)/crdatfri.o\
-		$(XPMDIR)/create.o\
-		$(XPMDIR)/crifrbuf.o\
-		$(XPMDIR)/crifrdat.o\
-		$(XPMDIR)/data.o\
-		$(XPMDIR)/image.o\
-		$(XPMDIR)/info.o\
-		$(XPMDIR)/hashtab.o\
-		$(XPMDIR)/misc.o\
-		$(XPMDIR)/parse.o\
-		$(XPMDIR)/rdftodat.o\
-		$(XPMDIR)/rdftoi.o\
-		$(XPMDIR)/rgb.o\
-		$(XPMDIR)/scan.o\
-		$(XPMDIR)/simx.o\
-		$(XPMDIR)/wrffrdat.o\
-		$(XPMDIR)/wrffri.o
-
 TIFFOBJS = $(TIFFDIR)/tif_aux.o \
 		$(TIFFDIR)/tif_close.o \
 		$(TIFFDIR)/tif_codec.o \
@@ -466,9 +479,9 @@ else
 endif
 
 ifndef WXMAKINGDLL
-all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB)
+all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB)
 else
-all:    $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB) $(WXDLL)
+all:    $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(WXDLL)
 endif
 
 ifndef WXMAKINGDLL
@@ -534,10 +547,6 @@ $(JPEGLIB): $(JPEGOBJS)
 	$(AR) $(AROPTIONS) $@ $(JPEGOBJS)
 	$(RANLIB) $@
 
-$(XPMLIB): $(XPMOBJS)
-	$(AR) $(AROPTIONS) $@ $(XPMOBJS)
-	$(RANLIB) $@
-
 $(TIFFLIB): $(TIFFOBJS)
 	$(AR) $(AROPTIONS) $@ $(TIFFOBJS)
 	$(RANLIB) $@
@@ -548,12 +557,20 @@ $(OBJECTS):	$(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
 $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
 	$(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
 
-$(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c   	
+$(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
 	$(COPY) ../common/dosyacc.c ../common/y_tab.c
 
 $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
 	$(COPY) ../common/doslex.c ../common/lex_yy.c
 
+
+#
+# NOTE: by default, you don't need to run $(LEX) and $(YACC)
+# to rebuild lex_yy.c and y_tab.c, since these will be copied
+# from the doslex.c and dosyacc.c files. So, normally you
+# don't need to uncomment the following lines.
+#
+#
 # Replace lex with flex if you run into compilation
 # problems with lex_yy.c. See also note about LEX_SCANNER
 # above.
@@ -602,15 +619,14 @@ clean:
 	-$(RM) ../png/*.bak
 	-$(RM) ../jpeg/*.o
 	-$(RM) ../jpeg/*.bak
-	-$(RM) ../xpm/*.o
-	-$(RM) ../xpm/*.bak
 	-$(RM) ../tiff/*.o
 	-$(RM) ../tiff/*.bak
+
+cleanall: clean
 	-$(RM) $(WXLIB)
 	-$(RM) $(ZLIBLIB)
 	-$(RM) $(PNGLIB)
 	-$(RM) $(JPEGLIB)
-	-$(RM) $(XPMLIB)
 	-$(RM) $(TIFFLIB)
 
 ifdef WXMAKINGDLL
@@ -622,7 +638,3 @@ ifneq "$(strip $(LD_SUPPORTS_SHARED))" "yes"
 endif
 endif
 
-
-cleanall: clean
-
-