Fix to MDI to restore 3D border; kludge to OGL Studio sample to redraw

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

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 619081eeda6343d4a103cd30a809e7ff0819edb4..a8e77fbb68dbf6064e9f4472e32265f2d7ac5acc 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 15:55, 2000/01/12
+# This file was automatically generated by tmake at 18:32, 2000/02/17

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


@@ -77,6 +77,7 @@ GENERICOBJS = \
                $(GENDIR)/logg.$(OBJSUFF) \
                $(GENDIR)/numdlgg.$(OBJSUFF) \
                $(GENDIR)/panelg.$(OBJSUFF) \
                $(GENDIR)/logg.$(OBJSUFF) \
                $(GENDIR)/numdlgg.$(OBJSUFF) \
                $(GENDIR)/panelg.$(OBJSUFF) \

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

                $(GENDIR)/progdlgg.$(OBJSUFF) \
                $(GENDIR)/prop.$(OBJSUFF) \
                $(GENDIR)/propform.$(OBJSUFF) \
                $(GENDIR)/progdlgg.$(OBJSUFF) \
                $(GENDIR)/prop.$(OBJSUFF) \
                $(GENDIR)/propform.$(OBJSUFF) \


@@ -106,6 +107,7 @@ COMMONOBJS  = \
                $(COMMDIR)/dbtable.$(OBJSUFF) \
                $(COMMDIR)/dcbase.$(OBJSUFF) \
                $(COMMDIR)/dlgcmn.$(OBJSUFF) \
                $(COMMDIR)/dbtable.$(OBJSUFF) \
                $(COMMDIR)/dcbase.$(OBJSUFF) \
                $(COMMDIR)/dlgcmn.$(OBJSUFF) \

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

                $(COMMDIR)/dobjcmn.$(OBJSUFF) \
                $(COMMDIR)/docmdi.$(OBJSUFF) \
                $(COMMDIR)/docview.$(OBJSUFF) \
                $(COMMDIR)/dobjcmn.$(OBJSUFF) \
                $(COMMDIR)/docmdi.$(OBJSUFF) \
                $(COMMDIR)/docview.$(OBJSUFF) \


@@ -123,9 +125,11 @@ COMMONOBJS  = \
                $(COMMDIR)/fontmap.$(OBJSUFF) \
                $(COMMDIR)/framecmn.$(OBJSUFF) \
                $(COMMDIR)/fs_inet.$(OBJSUFF) \
                $(COMMDIR)/fontmap.$(OBJSUFF) \
                $(COMMDIR)/framecmn.$(OBJSUFF) \
                $(COMMDIR)/fs_inet.$(OBJSUFF) \

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

                $(COMMDIR)/fs_zip.$(OBJSUFF) \
                $(COMMDIR)/ftp.$(OBJSUFF) \
                $(COMMDIR)/gdicmn.$(OBJSUFF) \
                $(COMMDIR)/fs_zip.$(OBJSUFF) \
                $(COMMDIR)/ftp.$(OBJSUFF) \
                $(COMMDIR)/gdicmn.$(OBJSUFF) \

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

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


@@ -148,7 +152,7 @@ COMMONOBJS  = \
                $(COMMDIR)/longlong.$(OBJSUFF) \
                $(COMMDIR)/memory.$(OBJSUFF) \
                $(COMMDIR)/menucmn.$(OBJSUFF) \
                $(COMMDIR)/longlong.$(OBJSUFF) \
                $(COMMDIR)/memory.$(OBJSUFF) \
                $(COMMDIR)/menucmn.$(OBJSUFF) \

-               $(COMMDIR)/mimetype.$(OBJSUFF) \
+               $(COMMDIR)/mimecmn.$(OBJSUFF) \

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


@@ -205,6 +209,7 @@ HTMLOBJS = \
                $(HTMLDIR)/m_layout.$(OBJSUFF) \
                $(HTMLDIR)/m_links.$(OBJSUFF) \
                $(HTMLDIR)/m_list.$(OBJSUFF) \
                $(HTMLDIR)/m_layout.$(OBJSUFF) \
                $(HTMLDIR)/m_links.$(OBJSUFF) \
                $(HTMLDIR)/m_list.$(OBJSUFF) \

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

                $(HTMLDIR)/m_pre.$(OBJSUFF) \
                $(HTMLDIR)/m_tables.$(OBJSUFF) \
                $(HTMLDIR)/winpars.$(OBJSUFF)
                $(HTMLDIR)/m_pre.$(OBJSUFF) \
                $(HTMLDIR)/m_tables.$(OBJSUFF) \
                $(HTMLDIR)/winpars.$(OBJSUFF)


@@ -240,6 +245,7 @@ MSWOBJS     = \
                $(MSWDIR)/dibutils.$(OBJSUFF) \
                $(MSWDIR)/dir.$(OBJSUFF) \
                $(MSWDIR)/dragimag.$(OBJSUFF) \
                $(MSWDIR)/dibutils.$(OBJSUFF) \
                $(MSWDIR)/dir.$(OBJSUFF) \
                $(MSWDIR)/dragimag.$(OBJSUFF) \

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

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


@@ -261,6 +267,7 @@ MSWOBJS     = \
                $(MSWDIR)/menu.$(OBJSUFF) \
                $(MSWDIR)/menuitem.$(OBJSUFF) \
                $(MSWDIR)/metafile.$(OBJSUFF) \
                $(MSWDIR)/menu.$(OBJSUFF) \
                $(MSWDIR)/menuitem.$(OBJSUFF) \
                $(MSWDIR)/metafile.$(OBJSUFF) \

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

                $(MSWDIR)/minifram.$(OBJSUFF) \
                $(MSWDIR)/msgdlg.$(OBJSUFF) \
                $(MSWDIR)/nativdlg.$(OBJSUFF) \
                $(MSWDIR)/minifram.$(OBJSUFF) \
                $(MSWDIR)/msgdlg.$(OBJSUFF) \
                $(MSWDIR)/nativdlg.$(OBJSUFF) \


@@ -391,17 +398,25 @@ JPEGOBJS    = \
                $(JPEGDIR)/jquant2.$(OBJSUFF) \
                $(JPEGDIR)/jdmerge.$(OBJSUFF)
 
                $(JPEGDIR)/jquant2.$(OBJSUFF) \
                $(JPEGDIR)/jdmerge.$(OBJSUFF)
 

-XPMOBJS =    $(XPMDIR)/crbuffri.o\
+XPMOBJS =    $(XPMDIR)/attrib.o\
+               $(XPMDIR)/crbuffri.o\

                $(XPMDIR)/crdatfri.o\
                $(XPMDIR)/crdatfri.o\

-               $(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\
+               $(XPMDIR)/create.o\
+               $(XPMDIR)/crifrbuf.o\

                $(XPMDIR)/crifrdat.o\
                $(XPMDIR)/data.o\
                $(XPMDIR)/crifrdat.o\
                $(XPMDIR)/data.o\

-               $(XPMDIR)/hashtab.o $(XPMDIR)/misc.o\
-               $(XPMDIR)/parse.o $(XPMDIR)/rdftodat.o\
+               $(XPMDIR)/image.o\
+               $(XPMDIR)/info.o\
+               $(XPMDIR)/hashtab.o\
+               $(XPMDIR)/misc.o\
+               $(XPMDIR)/parse.o\
+               $(XPMDIR)/rdftodat.o\

                $(XPMDIR)/rdftoi.o\
                $(XPMDIR)/rdftoi.o\

-               $(XPMDIR)/rgb.o $(XPMDIR)/scan.o\
-               $(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
-               $(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
+               $(XPMDIR)/rgb.o\
+               $(XPMDIR)/scan.o\
+               $(XPMDIR)/simx.o\
+               $(XPMDIR)/wrffrdat.o\
+               $(XPMDIR)/wrffri.o

 
 TIFFOBJS = $(TIFFDIR)/tif_aux.o \
                $(TIFFDIR)/tif_close.o \
 
 TIFFOBJS = $(TIFFDIR)/tif_aux.o \
                $(TIFFDIR)/tif_close.o \


@@ -447,7 +462,11 @@ else
   OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif
 
   OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif
 

+ifndef WXMAKINGDLL

 all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB)
 all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB)

+else
+all:    $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB) $(WXDLL)
+endif

 
 ifndef WXMAKINGDLL
 
 
 ifndef WXMAKINGDLL
 


@@ -501,23 +520,23 @@ endif
 
 
 $(ZLIBLIB): $(ZLIBOBJS)
 
 
 $(ZLIBLIB): $(ZLIBOBJS)

-       ar $(AROPTIONS) $@ $(ZLIBOBJS)
+       $(AR) $(AROPTIONS) $@ $(ZLIBOBJS)

        $(RANLIB) $@
 
 $(PNGLIB): $(PNGOBJS)
        $(RANLIB) $@
 
 $(PNGLIB): $(PNGOBJS)

-       ar $(AROPTIONS) $@ $(PNGOBJS)
+       $(AR) $(AROPTIONS) $@ $(PNGOBJS)

        $(RANLIB) $@
 
 $(JPEGLIB): $(JPEGOBJS)
        $(RANLIB) $@
 
 $(JPEGLIB): $(JPEGOBJS)

-       ar $(AROPTIONS) $@ $(JPEGOBJS)
+       $(AR) $(AROPTIONS) $@ $(JPEGOBJS)

        $(RANLIB) $@
 
 $(XPMLIB): $(XPMOBJS)
        $(RANLIB) $@
 
 $(XPMLIB): $(XPMOBJS)

-       ar $(AROPTIONS) $@ $(XPMOBJS)
+       $(AR) $(AROPTIONS) $@ $(XPMOBJS)

        $(RANLIB) $@
 
 $(TIFFLIB): $(TIFFOBJS)
        $(RANLIB) $@
 
 $(TIFFLIB): $(TIFFOBJS)

-       ar $(AROPTIONS) $@ $(TIFFOBJS)
+       $(AR) $(AROPTIONS) $@ $(TIFFOBJS)

        $(RANLIB) $@
 
 
        $(RANLIB) $@
 
 


@@ -526,7 +545,7 @@ $(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.$(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
+$(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c           

        $(COPY) ../common/dosyacc.c ../common/y_tab.c
 
 $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
        $(COPY) ../common/dosyacc.c ../common/y_tab.c
 
 $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c


@@ -585,6 +604,11 @@ clean:
        -$(RM) ../tiff/*.o
        -$(RM) ../tiff/*.bak
        -$(RM) $(WXLIB)
        -$(RM) ../tiff/*.o
        -$(RM) ../tiff/*.bak
        -$(RM) $(WXLIB)

+       -$(RM) $(ZLIBLIB)
+       -$(RM) $(PNGLIB)
+       -$(RM) $(JPEGLIB)
+       -$(RM) $(XPMLIB)
+       -$(RM) $(TIFFLIB)

 
 ifdef WXMAKINGDLL
        -$(RM) $(WXDLL)
 
 ifdef WXMAKINGDLL
        -$(RM) $(WXDLL)