removed old xpm code

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index a0461f5fa3ed900cb874ec22221e4d4b6cb5f1a9..b63d6f0371440125fb3ca40e56bb981c38c19695 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -18,7 +18,7 @@ MINGW32=1
 MINGW32VERSION=2.95
 
 # If building DLL, the version
-WXVERSION=22_0
+WXVERSION=23_0
 
 # Say yes if you have a "modern" linker that supports --shared option.
 # Note that you're probably going to wait forever for dlltool/gcc/etc
@@ -93,6 +93,7 @@ DLLTOOL = $(CROSS)dlltool
 
 # Miscellaneous compiler options
 # GRG: the __MINGW32__ option is not needed anymore
+# add "-DHAVE_W32API_H" if you have w32api >= 0.5
 OPTIONS = -DSTRICT # -D__MINGW32__
 
 # Debugging information
@@ -175,9 +176,9 @@ ifeq ($(MINGW32),1)
 endif
 
 #ifeq ($(MINGW32),1)
-#INC = -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/xpm -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS)
+#INC = -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS)
 #else
-INC = -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/xpm -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS) -I$(WXDIR)/include/wx/msw/gnuwin32 
+INC = -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS) -I$(WXDIR)/include/wx/msw/gnuwin32 
 #endif
 
 RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)/include"
@@ -186,7 +187,7 @@ ifdef WXUSINGDLL
   # png, jpeg, etc are exported from wx dll, so skip and save on link time.
   LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(COMPLIBS)
 else
-  LIBS = $(EXTRALIBS) $(WXLIB) -lpng -ljpeg -lzlib -lxpm -ltiff $(WINLIBS) $(COMPLIBS)
+  LIBS = $(EXTRALIBS) $(WXLIB) -lpng -ljpeg -lzlib -ltiff $(WINLIBS) $(COMPLIBS)
 endif
 
 WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION)