X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eafef53a5fcbde8716abc31a70ee40afd470ab27..9d8c2f419f522408a922277df330d4c4511befb9:/distrib/msw/tmake/g95.t

diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index 2619e66624..3ea3b709cc 100644
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -98,7 +98,7 @@ DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \
 	              $(WXDIR)/lib/libxpm.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
@@ -236,17 +236,26 @@ JPEGOBJS    = \
 		$(JPEGDIR)/jquant2.$(OBJSUFF) \
 		$(JPEGDIR)/jdmerge.$(OBJSUFF)
 
-XPMOBJS =    $(XPMDIR)/crbuffri.o\
-		$(XPMDIR)/crdatfri.o\
-		$(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\
-		$(XPMDIR)/crifrdat.o\
+# 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)/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
+		$(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 \
@@ -292,7 +301,11 @@ else
   OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif
 
+ifndef WXMAKINGDLL
 all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB)
+else
+all:    $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB) $(WXDLL)
+endif
 
 ifndef WXMAKINGDLL
 
@@ -346,23 +359,23 @@ endif
 
 
 $(ZLIBLIB): $(ZLIBOBJS)
-	ar $(AROPTIONS) $@ $(ZLIBOBJS)
+	$(AR) $(AROPTIONS) $@ $(ZLIBOBJS)
 	$(RANLIB) $@
 
 $(PNGLIB): $(PNGOBJS)
-	ar $(AROPTIONS) $@ $(PNGOBJS)
+	$(AR) $(AROPTIONS) $@ $(PNGOBJS)
 	$(RANLIB) $@
 
 $(JPEGLIB): $(JPEGOBJS)
-	ar $(AROPTIONS) $@ $(JPEGOBJS)
+	$(AR) $(AROPTIONS) $@ $(JPEGOBJS)
 	$(RANLIB) $@
 
 $(XPMLIB): $(XPMOBJS)
-	ar $(AROPTIONS) $@ $(XPMOBJS)
+	$(AR) $(AROPTIONS) $@ $(XPMOBJS)
 	$(RANLIB) $@
 
 $(TIFFLIB): $(TIFFOBJS)
-	ar $(AROPTIONS) $@ $(TIFFOBJS)
+	$(AR) $(AROPTIONS) $@ $(TIFFOBJS)
 	$(RANLIB) $@
 
 
@@ -429,7 +442,14 @@ clean:
 	-$(RM) ../xpm/*.bak
 	-$(RM) ../tiff/*.o
 	-$(RM) ../tiff/*.bak
+
+cleanall: clean
 	-$(RM) $(WXLIB)
+	-$(RM) $(ZLIBLIB)
+	-$(RM) $(PNGLIB)
+	-$(RM) $(JPEGLIB)
+	-$(RM) $(XPMLIB)
+	-$(RM) $(TIFFLIB)
 
 ifdef WXMAKINGDLL
 	-$(RM) $(WXDLL)
@@ -440,7 +460,3 @@ ifneq "$(strip $(LD_SUPPORTS_SHARED))" "yes"
 endif
 endif
 
-
-cleanall: clean
-
-