Added libxpm

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index 64d65ba3b1a100268719012b21935b20853926dc..1378b976765cf55b039c4359e23666c36a9f66ec 100644 (file)
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -103,6 +103,7 @@ ZLIBDIR = $(WXDIR)/src/zlib
 OLEDIR  = $(WXDIR)/src/msw/ole
 MSWDIR  = $(WXDIR)/src/msw
 
+XPMLIB = $(WXDIR)/lib/libxpm.a
 PNGLIB = $(WXDIR)/lib/libpng.a
 ZLIBLIB = $(WXDIR)/lib/libzlib.a
 JPEGLIB = $(WXDIR)/lib/libjpeg.a
@@ -219,7 +220,7 @@ JPEGOBJS    = \
                $(JPEGDIR)/jquant2.$(OBJSUFF) \
                $(JPEGDIR)/jdmerge.$(OBJSUFF)
 
-XPMOBJECTS =   $(XPMDIR)/crbuffri.o\
+XPMOBJS =    $(XPMDIR)/crbuffri.o\
                $(XPMDIR)/crdatfri.o\
                $(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\
                $(XPMDIR)/crifrdat.o\
@@ -233,15 +234,15 @@ XPMOBJECTS =      $(XPMDIR)/crbuffri.o\
 
 ifeq ($(MINGW32),1)
   ifeq ($(MINGW32VERSION),2.95)
-    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS) # $(XPMOBJECTS)   
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS)
   else
-    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) # $(XPMOBJECTS)
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
   endif
 else
-  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) # $(XPMOBJECTS)
+  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif
 
-all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(JPEGLIB) $(PNGLIB)
+all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(JPEGLIB) $(PNGLIB) $(XPMLIB)
 
 $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
        ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
@@ -259,6 +260,10 @@ $(JPEGLIB): $(JPEGOBJS)
        ar $(AROPTIONS) $@ $(JPEGOBJS)
        $(RANLIB) $@
 
+$(XPMLIB): $(XPMOBJS)
+       ar $(AROPTIONS) $@ $(XPMOBJS)
+       $(RANLIB) $@
+
 $(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
@@ -317,6 +322,9 @@ clean:
        -$(RM) ../zlib/*.o
        -$(RM) ../zlib/*.bak
        -$(RM) ../jpeg/*.o
+       -$(RM) ../jpeg/*.bak
+       -$(RM) ../xpm/*.o
+       -$(RM) ../xpm/*.bak
        -$(RM) ../../lib/libwx.a
 
 cleanall: clean

diff --git a/src/makeg95.env b/src/makeg95.env
index 36a2a1d03a6bb19b48a60f06ba8a58f8d291dd6a..09447800f692068ba5fa37e4b6a5c51c6bc468b3 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -16,7 +16,7 @@ MINGW32VERSION=2.95
 RM=rm -f 
 
 # Set to the appropriate copy command
-COPY=cp
+COPY=copy
 
 ########################## Compiler ##################################
 
@@ -60,7 +60,8 @@ RESFLAGS=$(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH)
 ########################## Compiler flags #############################
 
 # Miscellaneous compiler options
-OPTIONS= -DSTRICT # -D__MINGW32__
+# GRG: the __MINGW32__ option is not needed anymore
+OPTIONS = -DSTRICT # -D__MINGW32__
 
 # Debugging information
 DEBUGFLAGS = -D__WXDEBUG__
@@ -141,15 +142,15 @@ ifeq ($(MINGW32),1)
 endif
 
 ifeq ($(MINGW32),1)
-INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib $(EXTRAINC) $(COMPPATHS)
+INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/xpm $(EXTRAINC) $(COMPPATHS)
 else
-INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib $(EXTRAINC) $(COMPPATHS) -I$(WXDIR)/include/wx/msw/gnuwin32 
+INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/xpm $(EXTRAINC) $(COMPPATHS) -I$(WXDIR)/include/wx/msw/gnuwin32 
 endif
 
 RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)/include"
 
 #LIBS = $(WXLIB) $(WXDIR)/lib/libzlib.a $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
-LIBS = $(WXLIB) -lpng -ljpeg -lzlib $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
+LIBS = $(WXLIB) -lpng -ljpeg -lzlib -lxpm $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
 
 WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION)