X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c45a644eda9a0c6309090d8450780ca37faed9c8..ccf0b1d76ce28c0880df6d5c4866aaa548e2e56f:/distrib/msw/tmake/g95.t diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t index 7ba3b7d772..d685da66fa 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) @@ -239,15 +248,20 @@ $(COMMDIR)/lex_yy.c: $(COMMDIR)/doslex.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$(GUISUFFIX).a + -erase ..\..\lib\libwx.a cleanall: clean -