Added wxFileName.

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

diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index 2619e6662457225d4ce382210b861172685e120f..faed3e04bd5f9b5f6d87a2c3fcd4fe9e574b9e49 100644 (file)
--- 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 \
                      $(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
              -lwsock32 $(DLL_EXTRA_LIBS) \
                  -lstdc++
 endif


@@ -236,17 +236,26 @@ JPEGOBJS    = \
                $(JPEGDIR)/jquant2.$(OBJSUFF) \
                $(JPEGDIR)/jdmerge.$(OBJSUFF)
 
                $(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)/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 \
 
 TIFFOBJS = $(TIFFDIR)/tif_aux.o \
                $(TIFFDIR)/tif_close.o \


@@ -292,7 +301,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
 


@@ -346,23 +359,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) $@
 
 


@@ -430,6 +443,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)