X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd85fc6b89333821b22ae76808914d8e1d508095..18c98e42eeb75317f75c9ba20b09a5bd531a690c:/src/msw/makefile.g95

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 28e60757e5..932f95baa3 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,5 +1,4 @@
-
-# This file was automatically generated by tmake at 17:51, 1999/09/20
+# This file was automatically generated by tmake at 18:37, 1999/10/22
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -40,7 +39,7 @@ GENERICOBJS = \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
 		$(GENDIR)/choicdgg.$(OBJSUFF) \
 		$(GENDIR)/dirdlgg.$(OBJSUFF) \
-		$(GENDIR)/gridg.$(OBJSUFF) \
+		$(GENDIR)/grid.$(OBJSUFF) \
 		$(GENDIR)/laywin.$(OBJSUFF) \
 		$(GENDIR)/logg.$(OBJSUFF) \
 		$(GENDIR)/numdlgg.$(OBJSUFF) \
@@ -60,16 +59,20 @@ GENERICOBJS = \
 
 COMMONOBJS  = \
 		$(COMMDIR)/y_tab.$(OBJSUFF) \
+		$(COMMDIR)/appcmn.$(OBJSUFF) \
 		$(COMMDIR)/choiccmn.$(OBJSUFF) \
+		$(COMMDIR)/clipcmn.$(OBJSUFF) \
 		$(COMMDIR)/cmndata.$(OBJSUFF) \
 		$(COMMDIR)/config.$(OBJSUFF) \
 		$(COMMDIR)/ctrlcmn.$(OBJSUFF) \
+		$(COMMDIR)/ctrlsub.$(OBJSUFF) \
 		$(COMMDIR)/date.$(OBJSUFF) \
 		$(COMMDIR)/datstrm.$(OBJSUFF) \
 		$(COMMDIR)/db.$(OBJSUFF) \
 		$(COMMDIR)/dbtable.$(OBJSUFF) \
 		$(COMMDIR)/dcbase.$(OBJSUFF) \
 		$(COMMDIR)/dlgcmn.$(OBJSUFF) \
+		$(COMMDIR)/dobjcmn.$(OBJSUFF) \
 		$(COMMDIR)/docmdi.$(OBJSUFF) \
 		$(COMMDIR)/docview.$(OBJSUFF) \
 		$(COMMDIR)/dynarray.$(OBJSUFF) \
@@ -81,6 +84,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/fileconf.$(OBJSUFF) \
 		$(COMMDIR)/filefn.$(OBJSUFF) \
 		$(COMMDIR)/filesys.$(OBJSUFF) \
+		$(COMMDIR)/fontcmn.$(OBJSUFF) \
 		$(COMMDIR)/framecmn.$(OBJSUFF) \
 		$(COMMDIR)/fs_inet.$(OBJSUFF) \
 		$(COMMDIR)/fs_zip.$(OBJSUFF) \
@@ -90,6 +94,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/hash.$(OBJSUFF) \
 		$(COMMDIR)/helpbase.$(OBJSUFF) \
 		$(COMMDIR)/http.$(OBJSUFF) \
+		$(COMMDIR)/imagall.$(OBJSUFF) \
 		$(COMMDIR)/imagbmp.$(OBJSUFF) \
 		$(COMMDIR)/image.$(OBJSUFF) \
 		$(COMMDIR)/imaggif.$(OBJSUFF) \
@@ -100,6 +105,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/intl.$(OBJSUFF) \
 		$(COMMDIR)/ipcbase.$(OBJSUFF) \
 		$(COMMDIR)/layout.$(OBJSUFF) \
+		$(COMMDIR)/lboxcmn.$(OBJSUFF) \
 		$(COMMDIR)/list.$(OBJSUFF) \
 		$(COMMDIR)/log.$(OBJSUFF) \
 		$(COMMDIR)/memory.$(OBJSUFF) \
@@ -150,20 +156,21 @@ HTMLOBJS = \
 		$(HTMLDIR)/helpdata.$(OBJSUFF) \
 		$(HTMLDIR)/helpfrm.$(OBJSUFF) \
 		$(HTMLDIR)/htmlcell.$(OBJSUFF) \
-		$(HTMLDIR)/htmlfilter.$(OBJSUFF) \
-		$(HTMLDIR)/htmlparser.$(OBJSUFF) \
+		$(HTMLDIR)/htmlfilt.$(OBJSUFF) \
+		$(HTMLDIR)/htmlpars.$(OBJSUFF) \
 		$(HTMLDIR)/htmltag.$(OBJSUFF) \
 		$(HTMLDIR)/htmlwin.$(OBJSUFF) \
-		$(HTMLDIR)/htmlwinparser.$(OBJSUFF) \
-		$(HTMLDIR)/mod_fonts.$(OBJSUFF) \
-		$(HTMLDIR)/mod_hline.$(OBJSUFF) \
-		$(HTMLDIR)/mod_image.$(OBJSUFF) \
-		$(HTMLDIR)/mod_layout.$(OBJSUFF) \
-		$(HTMLDIR)/mod_links.$(OBJSUFF) \
-		$(HTMLDIR)/mod_list.$(OBJSUFF) \
-		$(HTMLDIR)/mod_pre.$(OBJSUFF) \
-		$(HTMLDIR)/mod_tables.$(OBJSUFF) \
-		$(HTMLDIR)/search.$(OBJSUFF)
+		$(HTMLDIR)/htmprint.$(OBJSUFF) \
+		$(HTMLDIR)/m_fonts.$(OBJSUFF) \
+		$(HTMLDIR)/m_hline.$(OBJSUFF) \
+		$(HTMLDIR)/m_image.$(OBJSUFF) \
+		$(HTMLDIR)/m_layout.$(OBJSUFF) \
+		$(HTMLDIR)/m_links.$(OBJSUFF) \
+		$(HTMLDIR)/m_list.$(OBJSUFF) \
+		$(HTMLDIR)/m_pre.$(OBJSUFF) \
+		$(HTMLDIR)/m_tables.$(OBJSUFF) \
+		$(HTMLDIR)/search.$(OBJSUFF) \
+		$(HTMLDIR)/winpars.$(OBJSUFF)
 
 MSWOBJS     = \
 		$(MSWDIR)/accel.$(OBJSUFF) \
@@ -232,6 +239,7 @@ MSWOBJS     = \
 		$(MSWDIR)/settings.$(OBJSUFF) \
 		$(MSWDIR)/slider95.$(OBJSUFF) \
 		$(MSWDIR)/spinbutt.$(OBJSUFF) \
+		$(MSWDIR)/spinctrl.$(OBJSUFF) \
 		$(MSWDIR)/statbmp.$(OBJSUFF) \
 		$(MSWDIR)/statbox.$(OBJSUFF) \
 		$(MSWDIR)/statbr95.$(OBJSUFF) \
@@ -251,6 +259,15 @@ MSWOBJS     = \
 		$(MSWDIR)/window.$(OBJSUFF) \
 		$(MSWDIR)/xpmhand.$(OBJSUFF)
 
+ADVANCEDOBJS     = \
+		$(COMMDIR)/odbc.$(OBJSUFF) \
+		$(MSWDIR)/ole/automtn.$(OBJSUFF) \
+		$(MSWDIR)/ole/dataobj.$(OBJSUFF) \
+		$(MSWDIR)/ole/dropsrc.$(OBJSUFF) \
+		$(MSWDIR)/ole/droptgt.$(OBJSUFF) \
+		$(MSWDIR)/ole/oleutils.$(OBJSUFF) \
+		$(MSWDIR)/ole/uuid.$(OBJSUFF)
+
 ZLIBOBJS    = \
 		$(ZLIBDIR)/adler32.$(OBJSUFF) \
 		$(ZLIBDIR)/compress.$(OBJSUFF) \
@@ -346,7 +363,20 @@ XPMOBJECTS = 	$(XPMDIR)/crbuffri.o\
 		$(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
 
 OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
+	  $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(ADVANCEDOBJS) # $(XPMOBJECTS)
+
+ifeq ($(MINGW32),1)
+  ifeq ($(MINGW32VERSION),2.95)
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
+	  $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) $(ADVANCEDOBJS) # $(XPMOBJECTS)   
+  else
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
+	  $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS)
+  endif
+else
+  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
 	  $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS)
+endif
 
 all:    $(OBJECTS) $(WXLIB)
 
@@ -396,21 +426,21 @@ $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
 #	mv y.tab.c $(COMMDIR)/y_tab.c
 
 clean:
-	-erase *.o
-	-erase *.bak
-	-erase core
-	-erase ..\common\y_tab.c
-	-erase ..\common\lex_yy.c
-	-erase ..\common\*.o
-	-erase ..\common\*.bak
-	-erase ..\generic\*.o
-	-erase ..\generic\*.bak
-	-erase ..\html\*.o
-	-erase ..\png\*.o
-	-erase ..\png\*.bak
-	-erase ..\zlib\*.o
-	-erase ..\zlib\*.bak
-	-erase ..\jpeg\*.o
-	-erase ..\..\lib\libwx.a
+	rm -f *.o
+	rm -f *.bak
+	rm -f core
+	rm -f ..\common\y_tab.c
+	rm -f ..\common\lex_yy.c
+	rm -f ..\common\*.o
+	rm -f ..\common\*.bak
+	rm -f ..\generic\*.o
+	rm -f ..\generic\*.bak
+	rm -f ..\html\*.o
+	rm -f ..\png\*.o
+	rm -f ..\png\*.bak
+	rm -f ..\zlib\*.o
+	rm -f ..\zlib\*.bak
+	rm -f ..\jpeg\*.o
+	rm -f ..\..\lib\libwx.a
 
 cleanall: clean