Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed libxpm dependencies from makefiles

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-05-09 22:36:25 +00:00
parent d2520c85b0
commit 9d8c2f419f
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/makefile.bcc
View File

@@ -51,7 +51,6 @@ BOR_VER = 4
WXBASEINC = $(WXDIR)\include\base WXBASEINC = $(WXDIR)\include\base
WXINC = $(WXDIR)\include\msw WXINC = $(WXDIR)\include\msw
PROLOGIOINC = $(WXDIR)\utils\prologio\src PROLOGIOINC = $(WXDIR)\utils\prologio\src
XPMINC=$(WXDIR)\contrib\wxxpm\libxpm.34b\lib
all: wxwin.cfg all: wxwin.cfg
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
@@ -80,7 +79,7 @@ wxwin.cfg: makefile.bcc
-WE -WE
-Fs- -Fs-
-Vf -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 -L$(BCCDIR)\lib
-Dwx_msw -Dwx_msw

6
src/makeg95.env
View File

@@ -176,9 +176,9 @@ ifeq ($(MINGW32),1)
endif endif
#ifeq ($(MINGW32),1) #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 #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 #endif
RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)/include" 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. # png, jpeg, etc are exported from wx dll, so skip and save on link time.
LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(COMPLIBS) LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(COMPLIBS)
else else
LIBS = $(EXTRALIBS) $(WXLIB) -lpng -ljpeg -lzlib -lxpm -ltiff $(WINLIBS) $(COMPLIBS) LIBS = $(EXTRALIBS) $(WXLIB) -lpng -ljpeg -lzlib -ltiff $(WINLIBS) $(COMPLIBS)
endif endif
WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION) WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION)

6
src/makeprog.b32
View File

@@ -14,13 +14,13 @@ WXDIR = $(WXWIN)
!include $(WXDIR)\src\makeb32.env !include $(WXDIR)\src\makeb32.env
!if "$(WXUSINGDLL)" == "1" !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 !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 !endif
# Note: you may need to remove some libraries for earlier versions of BC++, as below # 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" !if "$(FINAL)" == "0"
#LINKFLAGS=/v /c /Tpe $(LNKCFG) $(EXTRALINKFLAGS) #LINKFLAGS=/v /c /Tpe $(LNKCFG) $(EXTRALINKFLAGS)

2
src/makesl.env
View File

@@ -32,7 +32,7 @@ CCC = scc
CC = scc CC = scc
STACK = 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)\odbc32.lib $(WATLIBDIR)\comctl32.lib $(WATLIBDIR)\comdlg32.lib &
# $(WATLIBDIR)\ole32.lib $(WATLIBDIR)\oleaut32.lib $(WATLIBDIR)\uuid.lib # $(WATLIBDIR)\ole32.lib $(WATLIBDIR)\oleaut32.lib $(WATLIBDIR)\uuid.lib

2
src/makewat.env
View File

@@ -51,7 +51,7 @@ WATLIBDIR = $(WATCOMDIR)\lib386\nt
MINDATA = MINDATA =
MAXDATA = MAXDATA =
STACK = option stack=64k 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)\comctl32.lib $(WATLIBDIR)\comdlg32.lib &
$(WATLIBDIR)\ole32.lib $(WATLIBDIR)\oleaut32.lib $(WATLIBDIR)\opengl32.lib & $(WATLIBDIR)\ole32.lib $(WATLIBDIR)\oleaut32.lib $(WATLIBDIR)\opengl32.lib &
$(WATLIBDIR)\uuid.lib $(WXDIR)\lib\watcom\odbc32.lib $(WATLIBDIR)\uuid.lib $(WXDIR)\lib\watcom\odbc32.lib