More small fixes

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

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 0e32eda8df14bed3ddd0bda8b52682f0209589db..a154ac140f33cb77931ed606042b47905e6caaf9 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 01:26, 2001/04/29
+# This file was automatically generated by tmake at 21:02, 2001/06/26

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


@@ -25,7 +25,7 @@ WXDLL = $(WXDIR)/lib/wx$(WXVERSION).dll
 WXDEF = wx$(WXVERSION).def
 DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \
                  $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \
 WXDEF = wx$(WXVERSION).def
 DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \
                  $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \

-                     $(WXDIR)/lib/libxpm.a $(WXDIR)/lib/libtiff.a
+                    $(WXDIR)/lib/libtiff.a

 DLL_LDFLAGS = -L$(WXDIR)/lib
 DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
              -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
 DLL_LDFLAGS = -L$(WXDIR)/lib
 DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
              -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \


@@ -43,7 +43,6 @@ HTMLDIR = $(WXDIR)/src/html
 ZLIBDIR = $(WXDIR)/src/zlib
 PNGDIR  = $(WXDIR)/src/png
 JPEGDIR = $(WXDIR)/src/jpeg
 ZLIBDIR = $(WXDIR)/src/zlib
 PNGDIR  = $(WXDIR)/src/png
 JPEGDIR = $(WXDIR)/src/jpeg

-XPMDIR  = $(WXDIR)/src/xpm

 TIFFDIR = $(WXDIR)/src/tiff
 OLEDIR  = $(WXDIR)/src/msw/ole
 MSWDIR  = $(WXDIR)/src/msw
 TIFFDIR = $(WXDIR)/src/tiff
 OLEDIR  = $(WXDIR)/src/msw/ole
 MSWDIR  = $(WXDIR)/src/msw


@@ -51,7 +50,6 @@ MSWDIR  = $(WXDIR)/src/msw
 ZLIBLIB = $(WXDIR)/lib/libzlib.a
 PNGLIB  = $(WXDIR)/lib/libpng.a
 JPEGLIB = $(WXDIR)/lib/libjpeg.a
 ZLIBLIB = $(WXDIR)/lib/libzlib.a
 PNGLIB  = $(WXDIR)/lib/libpng.a
 JPEGLIB = $(WXDIR)/lib/libjpeg.a

-XPMLIB  = $(WXDIR)/lib/libxpm.a

 TIFFLIB = $(WXDIR)/lib/libtiff.a
 
 DOCDIR = $(WXDIR)/docs
 TIFFLIB = $(WXDIR)/lib/libtiff.a
 
 DOCDIR = $(WXDIR)/docs


@@ -75,6 +73,7 @@ GENERICOBJS = \
                $(GENDIR)/dirctrlg.$(OBJSUFF) \
                $(GENDIR)/dragimgg.$(OBJSUFF) \
                $(GENDIR)/grid.$(OBJSUFF) \
                $(GENDIR)/dirctrlg.$(OBJSUFF) \
                $(GENDIR)/dragimgg.$(OBJSUFF) \
                $(GENDIR)/grid.$(OBJSUFF) \

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

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


@@ -103,6 +102,7 @@ COMMONOBJS  = \
                $(COMMDIR)/choiccmn.$(OBJSUFF) \
                $(COMMDIR)/clipcmn.$(OBJSUFF) \
                $(COMMDIR)/cmdline.$(OBJSUFF) \
                $(COMMDIR)/choiccmn.$(OBJSUFF) \
                $(COMMDIR)/clipcmn.$(OBJSUFF) \
                $(COMMDIR)/cmdline.$(OBJSUFF) \

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

                $(COMMDIR)/cmndata.$(OBJSUFF) \
                $(COMMDIR)/config.$(OBJSUFF) \
                $(COMMDIR)/cshelp.$(OBJSUFF) \
                $(COMMDIR)/cmndata.$(OBJSUFF) \
                $(COMMDIR)/config.$(OBJSUFF) \
                $(COMMDIR)/cshelp.$(OBJSUFF) \


@@ -111,8 +111,10 @@ COMMONOBJS  = \
                $(COMMDIR)/datetime.$(OBJSUFF) \
                $(COMMDIR)/datstrm.$(OBJSUFF) \
                $(COMMDIR)/db.$(OBJSUFF) \
                $(COMMDIR)/datetime.$(OBJSUFF) \
                $(COMMDIR)/datstrm.$(OBJSUFF) \
                $(COMMDIR)/db.$(OBJSUFF) \

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

                $(COMMDIR)/dbtable.$(OBJSUFF) \
                $(COMMDIR)/dcbase.$(OBJSUFF) \
                $(COMMDIR)/dbtable.$(OBJSUFF) \
                $(COMMDIR)/dcbase.$(OBJSUFF) \

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

                $(COMMDIR)/dlgcmn.$(OBJSUFF) \
                $(COMMDIR)/dndcmn.$(OBJSUFF) \
                $(COMMDIR)/dobjcmn.$(OBJSUFF) \
                $(COMMDIR)/dlgcmn.$(OBJSUFF) \
                $(COMMDIR)/dndcmn.$(OBJSUFF) \
                $(COMMDIR)/dobjcmn.$(OBJSUFF) \


@@ -303,6 +305,7 @@ MSWOBJS     = \
                $(MSWDIR)/scrolbar.$(OBJSUFF) \
                $(MSWDIR)/settings.$(OBJSUFF) \
                $(MSWDIR)/slider95.$(OBJSUFF) \
                $(MSWDIR)/scrolbar.$(OBJSUFF) \
                $(MSWDIR)/settings.$(OBJSUFF) \
                $(MSWDIR)/slider95.$(OBJSUFF) \

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

                $(MSWDIR)/spinbutt.$(OBJSUFF) \
                $(MSWDIR)/spinctrl.$(OBJSUFF) \
                $(MSWDIR)/statbmp.$(OBJSUFF) \
                $(MSWDIR)/spinbutt.$(OBJSUFF) \
                $(MSWDIR)/spinctrl.$(OBJSUFF) \
                $(MSWDIR)/statbmp.$(OBJSUFF) \


@@ -322,8 +325,7 @@ MSWOBJS     = \
                $(MSWDIR)/utils.$(OBJSUFF) \
                $(MSWDIR)/utilsexc.$(OBJSUFF) \
                $(MSWDIR)/wave.$(OBJSUFF) \
                $(MSWDIR)/utils.$(OBJSUFF) \
                $(MSWDIR)/utilsexc.$(OBJSUFF) \
                $(MSWDIR)/wave.$(OBJSUFF) \

-               $(MSWDIR)/window.$(OBJSUFF) \
-               $(MSWDIR)/xpmhand.$(OBJSUFF)
+               $(MSWDIR)/window.$(OBJSUFF)

 
 ADVANCEDOBJS     = \
                $(COMMDIR)/odbc.$(OBJSUFF) \
 
 ADVANCEDOBJS     = \
                $(COMMDIR)/odbc.$(OBJSUFF) \


@@ -416,27 +418,6 @@ JPEGOBJS    = \
                $(JPEGDIR)/jquant2.$(OBJSUFF) \
                $(JPEGDIR)/jdmerge.$(OBJSUFF)
 
                $(JPEGDIR)/jquant2.$(OBJSUFF) \
                $(JPEGDIR)/jdmerge.$(OBJSUFF)
 

-# NOTE: these filenames are case sensitive!
-XPMOBJS =    $(XPMDIR)/Attrib.o\
-               $(XPMDIR)/CrBufFrI.o\
-               $(XPMDIR)/CrDatFrI.o\
-               $(XPMDIR)/create.o\
-               $(XPMDIR)/CrIFrBuf.o\
-               $(XPMDIR)/CrIFrDat.o\
-               $(XPMDIR)/data.o\
-               $(XPMDIR)/Image.o\
-               $(XPMDIR)/Info.o\
-               $(XPMDIR)/hashtab.o\
-               $(XPMDIR)/misc.o\
-               $(XPMDIR)/parse.o\
-               $(XPMDIR)/RdFToDat.o\
-               $(XPMDIR)/RdFToI.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 \
                $(TIFFDIR)/tif_codec.o \
 TIFFOBJS = $(TIFFDIR)/tif_aux.o \
                $(TIFFDIR)/tif_close.o \
                $(TIFFDIR)/tif_codec.o \


@@ -482,9 +463,9 @@ else
 endif
 
 ifndef WXMAKINGDLL
 endif
 
 ifndef WXMAKINGDLL

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

 else
 else

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

 endif
 
 ifndef WXMAKINGDLL
 endif
 
 ifndef WXMAKINGDLL


@@ -550,10 +531,6 @@ $(JPEGLIB): $(JPEGOBJS)
        $(AR) $(AROPTIONS) $@ $(JPEGOBJS)
        $(RANLIB) $@
 
        $(AR) $(AROPTIONS) $@ $(JPEGOBJS)
        $(RANLIB) $@
 

-$(XPMLIB): $(XPMOBJS)
-       $(AR) $(AROPTIONS) $@ $(XPMOBJS)
-       $(RANLIB) $@
-

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


@@ -618,8 +595,6 @@ clean:
        -$(RM) ../png/*.bak
        -$(RM) ../jpeg/*.o
        -$(RM) ../jpeg/*.bak
        -$(RM) ../png/*.bak
        -$(RM) ../jpeg/*.o
        -$(RM) ../jpeg/*.bak

-       -$(RM) ../xpm/*.o
-       -$(RM) ../xpm/*.bak

        -$(RM) ../tiff/*.o
        -$(RM) ../tiff/*.bak
 
        -$(RM) ../tiff/*.o
        -$(RM) ../tiff/*.bak
 


@@ -628,7 +603,6 @@ cleanall: clean
        -$(RM) $(ZLIBLIB)
        -$(RM) $(PNGLIB)
        -$(RM) $(JPEGLIB)
        -$(RM) $(ZLIBLIB)
        -$(RM) $(PNGLIB)
        -$(RM) $(JPEGLIB)

-       -$(RM) $(XPMLIB)

        -$(RM) $(TIFFLIB)
 
 ifdef WXMAKINGDLL
        -$(RM) $(TIFFLIB)
 
 ifdef WXMAKINGDLL