wxFileSystem now compiles if wxUSE_HTML (required by wxHTML)

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

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 932f95baa3abe5c4cf4325d64b4045b407d81e8f..eb89b5a2f6dd2698e947e90aceec5d5dfb7afc8b 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 18:37, 1999/10/22
+# This file was automatically generated by tmake at 20:12, 1999/12/29

 # 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!
 
 #


@@ -33,12 +33,28 @@ ZLIBDIR = $(WXDIR)/src/zlib
 OLEDIR  = $(WXDIR)/src/msw/ole
 MSWDIR  = $(WXDIR)/src/msw
 
 OLEDIR  = $(WXDIR)/src/msw/ole
 MSWDIR  = $(WXDIR)/src/msw
 

+PNGLIB = $(WXDIR)/lib/libpng.a
+ZLIBLIB = $(WXDIR)/lib/libzlib.a
+JPEGLIB = $(WXDIR)/lib/libjpeg.a
+

 DOCDIR = $(WXDIR)\docs
 
 DOCDIR = $(WXDIR)\docs
 

+# Only use the WIN32 wxDirDialog if we have a recent
+# version of Mingw32
+ifeq ($(MINGW32),1)
+  ifeq ($(MINGW32VERSION),2.95)
+               DIRDLGOBJ = $(MSWDIR)/dirdlg.$(OBJSUFF)
+  else
+               DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
+  endif
+else
+               DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
+endif
+

 GENERICOBJS = \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
 GENERICOBJS = \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \

+               $(GENDIR)/calctrl.$(OBJSUFF) \

                $(GENDIR)/choicdgg.$(OBJSUFF) \
                $(GENDIR)/choicdgg.$(OBJSUFF) \

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

                $(GENDIR)/grid.$(OBJSUFF) \
                $(GENDIR)/laywin.$(OBJSUFF) \
                $(GENDIR)/logg.$(OBJSUFF) \
                $(GENDIR)/grid.$(OBJSUFF) \
                $(GENDIR)/laywin.$(OBJSUFF) \
                $(GENDIR)/logg.$(OBJSUFF) \


@@ -52,7 +68,7 @@ GENERICOBJS = \
                $(GENDIR)/scrolwin.$(OBJSUFF) \
                $(GENDIR)/splitter.$(OBJSUFF) \
                $(GENDIR)/statusbr.$(OBJSUFF) \
                $(GENDIR)/scrolwin.$(OBJSUFF) \
                $(GENDIR)/splitter.$(OBJSUFF) \
                $(GENDIR)/statusbr.$(OBJSUFF) \

-               $(GENDIR)/tabg.$(OBJSUFF) \
+               $(GENDIR)/tbarsmpl.$(OBJSUFF) \

                $(GENDIR)/textdlgg.$(OBJSUFF) \
                $(GENDIR)/tipdlg.$(OBJSUFF) \
                $(GENDIR)/wizard.$(OBJSUFF)
                $(GENDIR)/textdlgg.$(OBJSUFF) \
                $(GENDIR)/tipdlg.$(OBJSUFF) \
                $(GENDIR)/wizard.$(OBJSUFF)


@@ -66,7 +82,7 @@ COMMONOBJS  = \
                $(COMMDIR)/config.$(OBJSUFF) \
                $(COMMDIR)/ctrlcmn.$(OBJSUFF) \
                $(COMMDIR)/ctrlsub.$(OBJSUFF) \
                $(COMMDIR)/config.$(OBJSUFF) \
                $(COMMDIR)/ctrlcmn.$(OBJSUFF) \
                $(COMMDIR)/ctrlsub.$(OBJSUFF) \

-               $(COMMDIR)/date.$(OBJSUFF) \
+               $(COMMDIR)/datetime.$(OBJSUFF) \

                $(COMMDIR)/datstrm.$(OBJSUFF) \
                $(COMMDIR)/db.$(OBJSUFF) \
                $(COMMDIR)/dbtable.$(OBJSUFF) \
                $(COMMDIR)/datstrm.$(OBJSUFF) \
                $(COMMDIR)/db.$(OBJSUFF) \
                $(COMMDIR)/dbtable.$(OBJSUFF) \


@@ -85,6 +101,7 @@ COMMONOBJS  = \
                $(COMMDIR)/filefn.$(OBJSUFF) \
                $(COMMDIR)/filesys.$(OBJSUFF) \
                $(COMMDIR)/fontcmn.$(OBJSUFF) \
                $(COMMDIR)/filefn.$(OBJSUFF) \
                $(COMMDIR)/filesys.$(OBJSUFF) \
                $(COMMDIR)/fontcmn.$(OBJSUFF) \

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

                $(COMMDIR)/framecmn.$(OBJSUFF) \
                $(COMMDIR)/fs_inet.$(OBJSUFF) \
                $(COMMDIR)/fs_zip.$(OBJSUFF) \
                $(COMMDIR)/framecmn.$(OBJSUFF) \
                $(COMMDIR)/fs_inet.$(OBJSUFF) \
                $(COMMDIR)/fs_zip.$(OBJSUFF) \


@@ -102,13 +119,16 @@ COMMONOBJS  = \
                $(COMMDIR)/imagpcx.$(OBJSUFF) \
                $(COMMDIR)/imagpng.$(OBJSUFF) \
                $(COMMDIR)/imagpnm.$(OBJSUFF) \
                $(COMMDIR)/imagpcx.$(OBJSUFF) \
                $(COMMDIR)/imagpng.$(OBJSUFF) \
                $(COMMDIR)/imagpnm.$(OBJSUFF) \

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

                $(COMMDIR)/intl.$(OBJSUFF) \
                $(COMMDIR)/ipcbase.$(OBJSUFF) \
                $(COMMDIR)/layout.$(OBJSUFF) \
                $(COMMDIR)/lboxcmn.$(OBJSUFF) \
                $(COMMDIR)/list.$(OBJSUFF) \
                $(COMMDIR)/log.$(OBJSUFF) \
                $(COMMDIR)/intl.$(OBJSUFF) \
                $(COMMDIR)/ipcbase.$(OBJSUFF) \
                $(COMMDIR)/layout.$(OBJSUFF) \
                $(COMMDIR)/lboxcmn.$(OBJSUFF) \
                $(COMMDIR)/list.$(OBJSUFF) \
                $(COMMDIR)/log.$(OBJSUFF) \

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

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

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

                $(COMMDIR)/mimetype.$(OBJSUFF) \
                $(COMMDIR)/module.$(OBJSUFF) \
                $(COMMDIR)/mstream.$(OBJSUFF) \
                $(COMMDIR)/mimetype.$(OBJSUFF) \
                $(COMMDIR)/module.$(OBJSUFF) \
                $(COMMDIR)/mstream.$(OBJSUFF) \


@@ -130,10 +150,8 @@ COMMONOBJS  = \
                $(COMMDIR)/stream.$(OBJSUFF) \
                $(COMMDIR)/string.$(OBJSUFF) \
                $(COMMDIR)/tbarbase.$(OBJSUFF) \
                $(COMMDIR)/stream.$(OBJSUFF) \
                $(COMMDIR)/string.$(OBJSUFF) \
                $(COMMDIR)/tbarbase.$(OBJSUFF) \

-               $(COMMDIR)/tbarsmpl.$(OBJSUFF) \

                $(COMMDIR)/textcmn.$(OBJSUFF) \
                $(COMMDIR)/textfile.$(OBJSUFF) \
                $(COMMDIR)/textcmn.$(OBJSUFF) \
                $(COMMDIR)/textfile.$(OBJSUFF) \

-               $(COMMDIR)/time.$(OBJSUFF) \

                $(COMMDIR)/timercmn.$(OBJSUFF) \
                $(COMMDIR)/tokenzr.$(OBJSUFF) \
                $(COMMDIR)/txtstrm.$(OBJSUFF) \
                $(COMMDIR)/timercmn.$(OBJSUFF) \
                $(COMMDIR)/tokenzr.$(OBJSUFF) \
                $(COMMDIR)/txtstrm.$(OBJSUFF) \


@@ -161,6 +179,7 @@ HTMLOBJS = \
                $(HTMLDIR)/htmltag.$(OBJSUFF) \
                $(HTMLDIR)/htmlwin.$(OBJSUFF) \
                $(HTMLDIR)/htmprint.$(OBJSUFF) \
                $(HTMLDIR)/htmltag.$(OBJSUFF) \
                $(HTMLDIR)/htmlwin.$(OBJSUFF) \
                $(HTMLDIR)/htmprint.$(OBJSUFF) \

+               $(HTMLDIR)/m_dflist.$(OBJSUFF) \

                $(HTMLDIR)/m_fonts.$(OBJSUFF) \
                $(HTMLDIR)/m_hline.$(OBJSUFF) \
                $(HTMLDIR)/m_image.$(OBJSUFF) \
                $(HTMLDIR)/m_fonts.$(OBJSUFF) \
                $(HTMLDIR)/m_hline.$(OBJSUFF) \
                $(HTMLDIR)/m_image.$(OBJSUFF) \


@@ -169,7 +188,6 @@ HTMLOBJS = \
                $(HTMLDIR)/m_list.$(OBJSUFF) \
                $(HTMLDIR)/m_pre.$(OBJSUFF) \
                $(HTMLDIR)/m_tables.$(OBJSUFF) \
                $(HTMLDIR)/m_list.$(OBJSUFF) \
                $(HTMLDIR)/m_pre.$(OBJSUFF) \
                $(HTMLDIR)/m_tables.$(OBJSUFF) \

-               $(HTMLDIR)/search.$(OBJSUFF) \

                $(HTMLDIR)/winpars.$(OBJSUFF)
 
 MSWOBJS     = \
                $(HTMLDIR)/winpars.$(OBJSUFF)
 
 MSWOBJS     = \


@@ -198,14 +216,19 @@ MSWOBJS     = \
                $(MSWDIR)/dcscreen.$(OBJSUFF) \
                $(MSWDIR)/dde.$(OBJSUFF) \
                $(MSWDIR)/dialog.$(OBJSUFF) \
                $(MSWDIR)/dcscreen.$(OBJSUFF) \
                $(MSWDIR)/dde.$(OBJSUFF) \
                $(MSWDIR)/dialog.$(OBJSUFF) \

+               $(MSWDIR)/dialup.$(OBJSUFF) \

                $(MSWDIR)/dib.$(OBJSUFF) \
                $(MSWDIR)/dibutils.$(OBJSUFF) \
                $(MSWDIR)/dib.$(OBJSUFF) \
                $(MSWDIR)/dibutils.$(OBJSUFF) \

+               $(MSWDIR)/dir.$(OBJSUFF) \

                $(MSWDIR)/dragimag.$(OBJSUFF) \
                $(MSWDIR)/filedlg.$(OBJSUFF) \
                $(MSWDIR)/font.$(OBJSUFF) \
                $(MSWDIR)/fontdlg.$(OBJSUFF) \
                $(MSWDIR)/dragimag.$(OBJSUFF) \
                $(MSWDIR)/filedlg.$(OBJSUFF) \
                $(MSWDIR)/font.$(OBJSUFF) \
                $(MSWDIR)/fontdlg.$(OBJSUFF) \

+               $(MSWDIR)/fontenum.$(OBJSUFF) \
+               $(MSWDIR)/fontutil.$(OBJSUFF) \

                $(MSWDIR)/frame.$(OBJSUFF) \
                $(MSWDIR)/gauge95.$(OBJSUFF) \
                $(MSWDIR)/frame.$(OBJSUFF) \
                $(MSWDIR)/gauge95.$(OBJSUFF) \

+               $(MSWDIR)/gdiimage.$(OBJSUFF) \

                $(MSWDIR)/gdiobj.$(OBJSUFF) \
                $(MSWDIR)/gsocket.$(OBJSUFF) \
                $(MSWDIR)/helpwin.$(OBJSUFF) \
                $(MSWDIR)/gdiobj.$(OBJSUFF) \
                $(MSWDIR)/gsocket.$(OBJSUFF) \
                $(MSWDIR)/helpwin.$(OBJSUFF) \


@@ -227,7 +250,6 @@ MSWOBJS     = \
                $(MSWDIR)/palette.$(OBJSUFF) \
                $(MSWDIR)/pen.$(OBJSUFF) \
                $(MSWDIR)/penwin.$(OBJSUFF) \
                $(MSWDIR)/palette.$(OBJSUFF) \
                $(MSWDIR)/pen.$(OBJSUFF) \
                $(MSWDIR)/penwin.$(OBJSUFF) \

-               $(MSWDIR)/pnghand.$(OBJSUFF) \

                $(MSWDIR)/printdlg.$(OBJSUFF) \
                $(MSWDIR)/printwin.$(OBJSUFF) \
                $(MSWDIR)/radiobox.$(OBJSUFF) \
                $(MSWDIR)/printdlg.$(OBJSUFF) \
                $(MSWDIR)/printwin.$(OBJSUFF) \
                $(MSWDIR)/radiobox.$(OBJSUFF) \


@@ -362,38 +384,44 @@ XPMOBJECTS =      $(XPMDIR)/crbuffri.o\
                $(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
                $(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
 
                $(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
                $(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
 

-OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
-         $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(ADVANCEDOBJS) # $(XPMOBJECTS)
-

 ifeq ($(MINGW32),1)
   ifeq ($(MINGW32VERSION),2.95)
 ifeq ($(MINGW32),1)
   ifeq ($(MINGW32VERSION),2.95)

-    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
-         $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) $(ADVANCEDOBJS) # $(XPMOBJECTS)   
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS) # $(XPMOBJECTS)   

   else
   else

-    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
-         $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS)
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) # $(XPMOBJECTS)

   endif
 else
   endif
 else

-  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
-         $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS)
+  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) # $(XPMOBJECTS)

 endif
 
 endif
 

-all:    $(OBJECTS) $(WXLIB)
+all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(JPEGLIB) $(PNGLIB)

 
 $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
        ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
        $(RANLIB) $@
 
 
 $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
        ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
        $(RANLIB) $@
 

+$(ZLIBLIB): $(ZLIBOBJS)
+       ar $(AROPTIONS) $@ $(ZLIBOBJS)
+       $(RANLIB) $@
+
+$(PNGLIB): $(PNGOBJS)
+       ar $(AROPTIONS) $@ $(PNGOBJS)
+       $(RANLIB) $@
+
+$(JPEGLIB): $(JPEGOBJS)
+       ar $(AROPTIONS) $@ $(JPEGOBJS)
+       $(RANLIB) $@
+

 $(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
 $(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

-       copy ..\common\dosyacc.c ..\common\y_tab.c
+       $(COPY) ..\\common\\dosyacc.c ..\\common\\y_tab.c

 
 $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
 
 $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c

-       copy ..\common\doslex.c ..\common\lex_yy.c
+       $(COPY) ..\\common\\doslex.c ..\\common\\lex_yy.c

 
 # Replace lex with flex if you run into compilation
 # problems with lex_yy.c. See also note about LEX_SCANNER
 
 # Replace lex with flex if you run into compilation
 # problems with lex_yy.c. See also note about LEX_SCANNER


@@ -426,21 +454,22 @@ $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
 #      mv y.tab.c $(COMMDIR)/y_tab.c
 
 clean:
 #      mv y.tab.c $(COMMDIR)/y_tab.c
 
 clean:

-       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
+       -$(RM) *.o
+       -$(RM) ole/*.o
+       -$(RM) *.bak
+       -$(RM) core
+       -$(RM) ../common/y_tab.c
+       -$(RM) ../common/lex_yy.c
+       -$(RM) ../common/*.o
+       -$(RM) ../common/*.bak
+       -$(RM) ../generic/*.o
+       -$(RM) ../generic/*.bak
+       -$(RM) ../html/*.o
+       -$(RM) ../png/*.o
+       -$(RM) ../png/*.bak
+       -$(RM) ../zlib/*.o
+       -$(RM) ../zlib/*.bak
+       -$(RM) ../jpeg/*.o
+       -$(RM) ../../lib/libwx.a

 
 cleanall: clean
 
 cleanall: clean