removed libxpm dependencies from makefiles

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

diff --git a/src/makefile.bcc b/src/makefile.bcc
index eec6ab1157454d1e7133dbcd0f12f0103d966201..b85f2aeac20991e777a58110fb588879945c50df 100644 (file)
--- a/src/makefile.bcc
+++ b/src/makefile.bcc
@@ -51,7 +51,6 @@ BOR_VER = 4
 WXBASEINC = $(WXDIR)\include\base
 WXINC = $(WXDIR)\include\msw
 PROLOGIOINC = $(WXDIR)\utils\prologio\src
-XPMINC=$(WXDIR)\contrib\wxxpm\libxpm.34b\lib
 
 all:    wxwin.cfg
        cd $(WXDIR)\src\msw
@@ -80,7 +79,7 @@ wxwin.cfg: makefile.bcc
 -WE
 -Fs-
 -Vf
--I$(WXBASEINC);$(WXINC);$(PROLOGIOINC);$(XPMINC);$(BCCDIR)\include;$(WXDIR)\contrib\fafa;$(WXDIR)\contrib\itsybits;$(WXDIR)\utils\rcparser\src
+-I$(WXBASEINC);$(WXINC);$(PROLOGIOINC);$(BCCDIR)\include;$(WXDIR)\contrib\fafa;$(WXDIR)\contrib\itsybits;$(WXDIR)\utils\rcparser\src
 
 -L$(BCCDIR)\lib
 -Dwx_msw

diff --git a/src/makeg95.env b/src/makeg95.env
index 6ddf27be2a36dbdb072077926201b0a96d06a38c..b63d6f0371440125fb3ca40e56bb981c38c19695 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -176,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"
@@ -187,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)

diff --git a/src/makeprog.b32 b/src/makeprog.b32
index 57d43f8396feeaf2b43b629028a8fa28bb0966c2..b1769c160283bd1c6c9f36d57a1119ea9daaf5dc 100644 (file)
--- a/src/makeprog.b32
+++ b/src/makeprog.b32
@@ -14,13 +14,13 @@ WXDIR = $(WXWIN)
 !include $(WXDIR)\src\makeb32.env
 
 !if "$(WXUSINGDLL)" == "1"
-LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 winpng zlib jpeg xpm tiff odbc32
+LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 winpng zlib jpeg tiff odbc32
 !else
-LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg xpm tiff odbc32
+LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg tiff odbc32
 !endif
 
 # Note: you may need to remove some libraries for earlier versions of BC++, as below
-#LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib xpm tiff
+#LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib tiff
 
 !if "$(FINAL)" == "0"
 #LINKFLAGS=/v /c /Tpe $(LNKCFG) $(EXTRALINKFLAGS)

diff --git a/src/makesl.env b/src/makesl.env
index e97c61c65574e8f2f7b277837adb08c00a4ab046..dd931e470703b5f826e1c2351636f7add30b7e21 100644 (file)
--- a/src/makesl.env
+++ b/src/makesl.env
@@ -32,7 +32,7 @@ CCC         = scc
 CC         =  scc
 STACK       =
 
-# EXTRALIBS   = $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\png.lib $(WXDIR)\lib\xpm.lib &
+# EXTRALIBS   = $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\png.lib &
 #      $(WATLIBDIR)\odbc32.lib $(WATLIBDIR)\comctl32.lib $(WATLIBDIR)\comdlg32.lib &
 #      $(WATLIBDIR)\ole32.lib $(WATLIBDIR)\oleaut32.lib $(WATLIBDIR)\uuid.lib
 

diff --git a/src/makewat.env b/src/makewat.env
index 6519f7472a3f69df61f99e327a25068513cf4355..78952be6294bb091e64551e035cb3966cf3db302 100644 (file)
--- a/src/makewat.env
+++ b/src/makewat.env
@@ -51,7 +51,7 @@ WATLIBDIR   = $(WATCOMDIR)\lib386\nt
 MINDATA     =
 MAXDATA     =
 STACK       = option stack=64k
-LIBS   = $(WXDIR)\lib\wx.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\png.lib $(WXDIR)\lib\tiff.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\xpm.lib &
+LIBS   = $(WXDIR)\lib\wx.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\png.lib $(WXDIR)\lib\tiff.lib $(WXDIR)\lib\jpeg.lib &
       $(WATLIBDIR)\comctl32.lib $(WATLIBDIR)\comdlg32.lib &
       $(WATLIBDIR)\ole32.lib $(WATLIBDIR)\oleaut32.lib $(WATLIBDIR)\opengl32.lib &
       $(WATLIBDIR)\uuid.lib $(WXDIR)\lib\watcom\odbc32.lib