Minor corrections to be able to compile with VC++ 1.5C and VC++ 4.1

[wxWidgets.git] / src / msw / makefile.g95

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 1cfd01d61e0b245b43af39fce9e91f78122e08fe..7538d1186c70161a514bbb260aced3ef605a29c3 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,6 +1,5 @@
 
 

-
-# This file was automatically generated by tmake at 00:12, 1999/07/29
+# This file was automatically generated by tmake at 15:14, 1999/08/18

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #


@@ -41,7 +40,6 @@ GENERICOBJS = \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
                $(GENDIR)/choicdgg.$(OBJSUFF) \
                $(GENDIR)/dirdlgg.$(OBJSUFF) \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
                $(GENDIR)/choicdgg.$(OBJSUFF) \
                $(GENDIR)/dirdlgg.$(OBJSUFF) \

-               $(GENDIR)/extdlgg.$(OBJSUFF) \

                $(GENDIR)/gridg.$(OBJSUFF) \
                $(GENDIR)/laywin.$(OBJSUFF) \
                $(GENDIR)/numdlgg.$(OBJSUFF) \
                $(GENDIR)/gridg.$(OBJSUFF) \
                $(GENDIR)/laywin.$(OBJSUFF) \
                $(GENDIR)/numdlgg.$(OBJSUFF) \


@@ -56,7 +54,8 @@ GENERICOBJS = \
                $(GENDIR)/statusbr.$(OBJSUFF) \
                $(GENDIR)/tabg.$(OBJSUFF) \
                $(GENDIR)/textdlgg.$(OBJSUFF) \
                $(GENDIR)/statusbr.$(OBJSUFF) \
                $(GENDIR)/tabg.$(OBJSUFF) \
                $(GENDIR)/textdlgg.$(OBJSUFF) \

-               $(GENDIR)/tipdlg.$(OBJSUFF)
+               $(GENDIR)/tipdlg.$(OBJSUFF) \
+               $(GENDIR)/wizard.$(OBJSUFF)

 
 COMMONOBJS  = \
                $(COMMDIR)/y_tab.$(OBJSUFF) \
 
 COMMONOBJS  = \
                $(COMMDIR)/y_tab.$(OBJSUFF) \


@@ -86,6 +85,7 @@ COMMONOBJS  = \
                $(COMMDIR)/fs_zip.$(OBJSUFF) \
                $(COMMDIR)/ftp.$(OBJSUFF) \
                $(COMMDIR)/gdicmn.$(OBJSUFF) \
                $(COMMDIR)/fs_zip.$(OBJSUFF) \
                $(COMMDIR)/ftp.$(OBJSUFF) \
                $(COMMDIR)/gdicmn.$(OBJSUFF) \

+               $(COMMDIR)/gifdecod.$(OBJSUFF) \

                $(COMMDIR)/hash.$(OBJSUFF) \
                $(COMMDIR)/helpbase.$(OBJSUFF) \
                $(COMMDIR)/http.$(OBJSUFF) \
                $(COMMDIR)/hash.$(OBJSUFF) \
                $(COMMDIR)/helpbase.$(OBJSUFF) \
                $(COMMDIR)/http.$(OBJSUFF) \


@@ -94,6 +94,7 @@ COMMONOBJS  = \
                $(COMMDIR)/imaggif.$(OBJSUFF) \
                $(COMMDIR)/imagjpeg.$(OBJSUFF) \
                $(COMMDIR)/imagpng.$(OBJSUFF) \
                $(COMMDIR)/imaggif.$(OBJSUFF) \
                $(COMMDIR)/imagjpeg.$(OBJSUFF) \
                $(COMMDIR)/imagpng.$(OBJSUFF) \

+               $(COMMDIR)/imagpnm.$(OBJSUFF) \

                $(COMMDIR)/intl.$(OBJSUFF) \
                $(COMMDIR)/ipcbase.$(OBJSUFF) \
                $(COMMDIR)/layout.$(OBJSUFF) \
                $(COMMDIR)/intl.$(OBJSUFF) \
                $(COMMDIR)/ipcbase.$(OBJSUFF) \
                $(COMMDIR)/layout.$(OBJSUFF) \


@@ -114,7 +115,9 @@ COMMONOBJS  = \
                $(COMMDIR)/sckfile.$(OBJSUFF) \
                $(COMMDIR)/sckipc.$(OBJSUFF) \
                $(COMMDIR)/sckstrm.$(OBJSUFF) \
                $(COMMDIR)/sckfile.$(OBJSUFF) \
                $(COMMDIR)/sckipc.$(OBJSUFF) \
                $(COMMDIR)/sckstrm.$(OBJSUFF) \

+               $(COMMDIR)/sizer.$(OBJSUFF) \

                $(COMMDIR)/socket.$(OBJSUFF) \
                $(COMMDIR)/socket.$(OBJSUFF) \

+               $(COMMDIR)/strconv.$(OBJSUFF) \

                $(COMMDIR)/stream.$(OBJSUFF) \
                $(COMMDIR)/string.$(OBJSUFF) \
                $(COMMDIR)/tbarbase.$(OBJSUFF) \
                $(COMMDIR)/stream.$(OBJSUFF) \
                $(COMMDIR)/string.$(OBJSUFF) \
                $(COMMDIR)/tbarbase.$(OBJSUFF) \


@@ -135,10 +138,27 @@ COMMONOBJS  = \
                $(COMMDIR)/wincmn.$(OBJSUFF) \
                $(COMMDIR)/wxchar.$(OBJSUFF) \
                $(COMMDIR)/wxexpr.$(OBJSUFF) \
                $(COMMDIR)/wincmn.$(OBJSUFF) \
                $(COMMDIR)/wxchar.$(OBJSUFF) \
                $(COMMDIR)/wxexpr.$(OBJSUFF) \

-               $(COMMDIR)/zipstream.$(OBJSUFF) \
+               $(COMMDIR)/zipstrm.$(OBJSUFF) \

                $(COMMDIR)/zstream.$(OBJSUFF)
 
 HTMLOBJS = \
                $(COMMDIR)/zstream.$(OBJSUFF)
 
 HTMLOBJS = \

+                $(HTMLDIR)/htmlcell.$(OBJSUFF) \
+               $(HTMLDIR)/htmlfilter.$(OBJSUFF) \
+               $(HTMLDIR)/htmlhelp.$(OBJSUFF) \
+               $(HTMLDIR)/htmlhelp_io.$(OBJSUFF) \
+               $(HTMLDIR)/htmlparser.$(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)

 
 MSWOBJS     = \
                $(MSWDIR)/accel.$(OBJSUFF) \
 
 MSWOBJS     = \
                $(MSWDIR)/accel.$(OBJSUFF) \


@@ -371,21 +391,20 @@ $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
 
 clean:
        -erase *.o
 
 clean:
        -erase *.o

+       -erase *.bak

        -erase core
        -erase ..\common\y_tab.c
        -erase ..\common\lex_yy.c
        -erase ..\common\*.o
        -erase core
        -erase ..\common\y_tab.c
        -erase ..\common\lex_yy.c
        -erase ..\common\*.o

+       -erase ..\common\*.bak

        -erase ..\generic\*.o
        -erase ..\generic\*.o

+       -erase ..\generic\*.bak

        -erase ..\html\*.o
        -erase ..\png\*.o
        -erase ..\html\*.o
        -erase ..\png\*.o

+       -erase ..\png\*.bak

        -erase ..\zlib\*.o
        -erase ..\zlib\*.o

+       -erase ..\zlib\*.bak

        -erase ..\jpeg\*.o
        -erase ..\jpeg\*.o

-       -erase ..\..\lib\libwx$(GUISUFFIX).a
+       -erase ..\..\lib\libwx.a

 
 cleanall: clean
 
 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