X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9be9b97445f6e28b1ef9fd1fefdc28f40da51b24..f56b833007c6994cd1678cb01da91312b3ef143c:/distrib/msw/tmake/g95.t

diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index af071b17cc..bebd32bbff 100644
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -43,10 +43,15 @@
         next if $file =~ /^dirdlg\./;
 
         $file =~ s/cp?p?$/\$(OBJSUFF)/;
-        $project{"WXMSWOBJS"} .= $file . " "
+        $project{"WXMSWOBJS"} .= '$(MSWDIR)/' . $file . " "
+    }
+
+    foreach $file (sort keys %wxHTML) {
+        $file =~ s/cp?p?$/\$(OBJSUFF)/;
+        $project{"WXHTMLOBJS"} .= '$(HTMLDIR)/' . $file . " "
     }
-#$}
 
+#$}
 # This file was automatically generated by tmake at #$ Now()
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
@@ -74,6 +79,7 @@ EXTRAOBJS=
 
 GENDIR  = $(WXDIR)/src/generic
 COMMDIR = $(WXDIR)/src/common
+HTMLDIR = $(WXDIR)/src/html
 XPMDIR  = $(WXDIR)/src/xpm
 PNGDIR  = $(WXDIR)/src/png
 JPEGDIR = $(WXDIR)/src/jpeg
@@ -90,6 +96,9 @@ COMMONOBJS  = \
 		$(COMMDIR)/y_tab.$(OBJSUFF) \
 		#$ ExpandList("WXCOMMONOBJS");
 
+HTMLOBJS = \
+                #$ ExpandList("WXHTMLOBJS");
+
 MSWOBJS     = \
 		#$ ExpandList("WXMSWOBJS");
 
@@ -187,7 +196,7 @@ XPMOBJECTS = 	$(XPMDIR)/crbuffri.o\
 		$(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
 		$(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
 
-OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) \
+OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
 	  $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS)
 
 all:    $(OBJECTS) $(WXLIB)
@@ -244,15 +253,10 @@ clean:
 	-erase ..\common\lex_yy.c
 	-erase ..\common\*.o
 	-erase ..\generic\*.o
+	-erase ..\html\*.o
 	-erase ..\png\*.o
 	-erase ..\zlib\*.o
 	-erase ..\jpeg\*.o
-	-erase ..\..\lib\libwx$(GUISUFFIX).a
+	-erase ..\..\lib\libwx.a
 
 cleanall: clean
-
-MFTYPE=g95
-makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
-	cd $(WXWIN)\distrib\msw\tmake
-	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
-	copy makefile.$(MFTYPE) $(WXWIN)\src\msw