backported fix for proper tree ctrl refershing after changing item colour/font from 2.2

[wxWidgets.git] / distrib / msw / tmake / g95.t

diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index 2619e6662457225d4ce382210b861172685e120f..252457b0e461655e0021f0b06c79589d006b01d9 100644 (file)
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -95,10 +95,10 @@ 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 \
-                     $(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 \
+             -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
              -lwsock32 $(DLL_EXTRA_LIBS) \
                  -lstdc++
 endif
@@ -113,7 +113,6 @@ HTMLDIR = $(WXDIR)/src/html
 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
@@ -121,7 +120,6 @@ MSWDIR  = $(WXDIR)/src/msw
 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
@@ -236,18 +234,6 @@ JPEGOBJS    = \
                $(JPEGDIR)/jquant2.$(OBJSUFF) \
                $(JPEGDIR)/jdmerge.$(OBJSUFF)
 
-XPMOBJS =    $(XPMDIR)/crbuffri.o\
-               $(XPMDIR)/crdatfri.o\
-               $(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\
-               $(XPMDIR)/crifrdat.o\
-               $(XPMDIR)/data.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)/wrffrp.o $(XPMDIR)/wrffri.o
-
 TIFFOBJS = $(TIFFDIR)/tif_aux.o \
                $(TIFFDIR)/tif_close.o \
                $(TIFFDIR)/tif_codec.o \
@@ -292,7 +278,11 @@ else
   OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif
 
-all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB)
+ifndef WXMAKINGDLL
+all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB)
+else
+all:    $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(WXDLL)
+endif
 
 ifndef WXMAKINGDLL
 
@@ -346,23 +336,19 @@ endif
 
 
 $(ZLIBLIB): $(ZLIBOBJS)
-       ar $(AROPTIONS) $@ $(ZLIBOBJS)
+       $(AR) $(AROPTIONS) $@ $(ZLIBOBJS)
        $(RANLIB) $@
 
 $(PNGLIB): $(PNGOBJS)
-       ar $(AROPTIONS) $@ $(PNGOBJS)
+       $(AR) $(AROPTIONS) $@ $(PNGOBJS)
        $(RANLIB) $@
 
 $(JPEGLIB): $(JPEGOBJS)
-       ar $(AROPTIONS) $@ $(JPEGOBJS)
-       $(RANLIB) $@
-
-$(XPMLIB): $(XPMOBJS)
-       ar $(AROPTIONS) $@ $(XPMOBJS)
+       $(AR) $(AROPTIONS) $@ $(JPEGOBJS)
        $(RANLIB) $@
 
 $(TIFFLIB): $(TIFFOBJS)
-       ar $(AROPTIONS) $@ $(TIFFOBJS)
+       $(AR) $(AROPTIONS) $@ $(TIFFOBJS)
        $(RANLIB) $@
 
 
@@ -425,11 +411,15 @@ clean:
        -$(RM) ../png/*.bak
        -$(RM) ../jpeg/*.o
        -$(RM) ../jpeg/*.bak
-       -$(RM) ../xpm/*.o
-       -$(RM) ../xpm/*.bak
        -$(RM) ../tiff/*.o
        -$(RM) ../tiff/*.bak
+
+cleanall: clean
        -$(RM) $(WXLIB)
+       -$(RM) $(ZLIBLIB)
+       -$(RM) $(PNGLIB)
+       -$(RM) $(JPEGLIB)
+       -$(RM) $(TIFFLIB)
 
 ifdef WXMAKINGDLL
        -$(RM) $(WXDLL)
@@ -440,7 +430,3 @@ ifneq "$(strip $(LD_SUPPORTS_SHARED))" "yes"
 endif
 endif
 
-
-cleanall: clean
-
-