removed libxpm from templates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
9d8c2f419f
commit
268d5364cf
@ -98,7 +98,6 @@ WXBUILDDLL=1
|
||||
# Please set these according to the settings in wx_setup.h, so we can include
|
||||
# the appropriate libraries in wx.lib
|
||||
USE_CTL3D=0
|
||||
USE_XPM_IN_MSW=1
|
||||
|
||||
PERIPH_LIBS=
|
||||
PERIPH_TARGET=
|
||||
@ -111,12 +110,6 @@ PERIPH_TARGET=ctl3d $(PERIPH_TARGET)
|
||||
PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET)
|
||||
!endif
|
||||
|
||||
!if "$(USE_XPM_IN_MSW)" == "1"
|
||||
PERIPH_LIBS=$(WXDIR)\lib\xpm.lib $(PERIPH_LIBS)
|
||||
PERIPH_TARGET=xpm $(PERIPH_TARGET)
|
||||
PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
|
||||
!endif
|
||||
|
||||
#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS)
|
||||
PERIPH_LIBS=
|
||||
PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET)
|
||||
@ -126,7 +119,7 @@ PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TA
|
||||
DUMMY=dummy
|
||||
!else
|
||||
DUMMY=dummydll
|
||||
LIBS= cw32mti import32 ole2w32 odbc32 xpm zlib winpng jpeg tiff
|
||||
LIBS= cw32mti import32 ole2w32 odbc32 zlib winpng jpeg tiff
|
||||
!endif
|
||||
|
||||
LIBTARGET=$(WXLIB)
|
||||
@ -281,16 +274,6 @@ all_execs:
|
||||
make -f makefile.b32 all_execs
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
wxxpm: $(CFG)
|
||||
cd $(WXDIR)\src\xpm
|
||||
make -f makefile.b32 -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
clean_wxxpm: $(CFG)
|
||||
cd $(WXDIR)\src\xpm
|
||||
make -f makefile.b32 clean
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
png: $(CFG)
|
||||
cd $(WXDIR)\src\png
|
||||
make -f makefile.b32
|
||||
@ -321,16 +304,6 @@ clean_jpeg:
|
||||
make -f makefile.b32 clean
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
xpm: $(CFG)
|
||||
cd $(WXDIR)\src\xpm
|
||||
make -f makefile.b32 lib
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
clean_xpm:
|
||||
cd $(WXDIR)\src\xpm
|
||||
make -f makefile.b32 clean
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
tiff: $(CFG)
|
||||
cd $(WXDIR)\src\tiff
|
||||
make -f makefile.b32 lib
|
||||
@ -356,7 +329,7 @@ $(CFG): makefile.b32
|
||||
-WE
|
||||
-tWM
|
||||
|
||||
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff
|
||||
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff
|
||||
-I$(WXDIR)\include\wx\msw\gnuwin32
|
||||
|
||||
-L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
|
||||
|
@ -98,7 +98,6 @@ THISDIR = $(WXDIR)\src\msw
|
||||
# Please set these according to the settings in wx_setup.h, so we can include
|
||||
# the appropriate libraries in wx.lib
|
||||
USE_CTL3D=1
|
||||
USE_XPM_IN_MSW=1
|
||||
|
||||
PERIPH_LIBS=
|
||||
PERIPH_TARGET=
|
||||
@ -108,12 +107,6 @@ PERIPH_CLEAN_TARGET=
|
||||
PERIPH_LIBS=$(WXDIR)\lib\bcc16\ctl3dv2.lib $(PERIPH_LIBS)
|
||||
!endif
|
||||
|
||||
!if "$(USE_XPM_IN_MSW)" == "1"
|
||||
PERIPH_LIBS=$(WXDIR)\lib\xpm.lib $(PERIPH_LIBS)
|
||||
PERIPH_TARGET=xpm $(PERIPH_TARGET)
|
||||
PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
|
||||
!endif
|
||||
|
||||
# TODO: add these libraries
|
||||
# PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(PERIPH_LIBS)
|
||||
PERIPH_TARGET=zlib png $(PERIPH_TARGET)
|
||||
@ -228,16 +221,6 @@ all_execs:
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
# CONTRIB
|
||||
xpm: $(CFG)
|
||||
cd $(WXDIR)\src\xpm
|
||||
make -f makefile.bcc -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
clean_xpm: $(CFG)
|
||||
cd $(WXDIR)\src\xpm
|
||||
make -f makefile.bcc clean
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
png: $(CFG)
|
||||
cd $(WXDIR)\src\png
|
||||
make -f makefile.bcc
|
||||
@ -275,7 +258,7 @@ $(CFG): makefile.bcc
|
||||
-Fs-
|
||||
-Vf
|
||||
-Ff=4
|
||||
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
|
||||
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/zlib
|
||||
-I$(WXDIR)\include\wx\msw\gnuwin32
|
||||
-L$(BCCDIR)\lib
|
||||
-D__WXWIN__
|
||||
|
@ -78,7 +78,6 @@ DUMMYOBJ=dummy.obj
|
||||
# This one overrides the others, to be consistent with the settings in wx_setup.h
|
||||
MINIMAL_WXWINDOWS_SETUP=0
|
||||
|
||||
USE_XPM_IN_MSW=1
|
||||
USE_CTL3D=1
|
||||
|
||||
!if "$(MINIMAL_WXWINDOWS_SETUP)" == "1"
|
||||
@ -94,12 +93,6 @@ PERIPH_CLEAN_TARGET=
|
||||
# PERIPH_LIBS=d:\msdev\lib\ctl3d32.lib $(PERIPH_LIBS)
|
||||
# !endif
|
||||
|
||||
!if "$(USE_XPM_IN_MSW)" == "1"
|
||||
PERIPH_LIBS=$(WXDIR)\lib\xpm.lib $(PERIPH_LIBS)
|
||||
PERIPH_TARGET=xpm $(PERIPH_TARGET)
|
||||
PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
|
||||
!endif
|
||||
|
||||
# PNG and Zlib
|
||||
PERIPH_TARGET=png zlib $(PERIPH_TARGET)
|
||||
PERIPH_CLEAN_TARGET=clean_png clean_zlib $(PERIPH_CLEAN_TARGET)
|
||||
@ -125,7 +118,6 @@ MSWOBJS1 = #$ ExpandList("WXMSWOBJS1");
|
||||
MSWOBJS2 = #$ ExpandList("WXMSWOBJS2");
|
||||
|
||||
# TODO: Implement XPM and PNG targets in this makefile!
|
||||
# $(OLEDIR)\xpmhand \
|
||||
# $(OLEDIR)\pnghand \
|
||||
|
||||
OBJECTS = $(COMMONOBJS1) $(COMMONOBJS2) $(GENERICOBJS) $(MSWOBJS1) $(MSWOBJS2)
|
||||
@ -235,18 +227,6 @@ $(OBJECTS): $(WXDIR)/include/wx/setup.h
|
||||
|
||||
# Peripheral components
|
||||
|
||||
$(WXDIR)\lib\xpm.lib: xpm
|
||||
|
||||
xpm:
|
||||
cd $(WXDIR)\src\xpm
|
||||
nmake -f makefile.dos FINAL=$(FINAL)
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
clean_xpm:
|
||||
cd $(WXDIR)\src\xpm
|
||||
nmake -f makefile.dos clean
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
zlib:
|
||||
cd $(WXDIR)\src\zlib
|
||||
nmake -f makefile.dos FINAL=$(FINAL)
|
||||
|
@ -76,7 +76,6 @@ EXTRAOBJS=
|
||||
GENDIR = $(WXDIR)/src/generic
|
||||
COMMDIR = $(WXDIR)/src/common
|
||||
HTMLDIR = $(WXDIR)/src/html
|
||||
XPMDIR = $(WXDIR)/src/xpm
|
||||
PNGDIR = $(WXDIR)/src/png
|
||||
JPEGDIR = $(WXDIR)/src/jpeg
|
||||
ZLIBDIR = $(WXDIR)/src/zlib
|
||||
@ -180,20 +179,8 @@ JPEGOBJS = \
|
||||
$(JPEGDIR)/jquant2.$(OBJSUFF) \
|
||||
$(JPEGDIR)/jdmerge.$(OBJSUFF)
|
||||
|
||||
XPMOBJECTS = $(XPMDIR)/crbuffri.o\
|
||||
$(XPMDIR)/crdatfri.o\
|
||||
$(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\
|
||||
$(XPMDIR)/crifrdat.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
|
||||
|
||||
OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
|
||||
$(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS)
|
||||
$(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS)
|
||||
|
||||
all: $(OBJECTS) $(WXLIB)
|
||||
|
||||
|
@ -95,7 +95,7 @@ WXDLL = $(WXDIR)/lib/wx$(WXVERSION).dll
|
||||
WXDEF = wx$(WXVERSION).def
|
||||
DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \
|
||||
$(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \
|
||||
$(WXDIR)/lib/libxpm.a $(WXDIR)/lib/libtiff.a
|
||||
$(WXDIR)/lib/libtiff.a
|
||||
DLL_LDFLAGS = -L$(WXDIR)/lib
|
||||
DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
|
||||
-luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
|
||||
@ -113,7 +113,6 @@ HTMLDIR = $(WXDIR)/src/html
|
||||
ZLIBDIR = $(WXDIR)/src/zlib
|
||||
PNGDIR = $(WXDIR)/src/png
|
||||
JPEGDIR = $(WXDIR)/src/jpeg
|
||||
XPMDIR = $(WXDIR)/src/xpm
|
||||
TIFFDIR = $(WXDIR)/src/tiff
|
||||
OLEDIR = $(WXDIR)/src/msw/ole
|
||||
MSWDIR = $(WXDIR)/src/msw
|
||||
@ -121,7 +120,6 @@ MSWDIR = $(WXDIR)/src/msw
|
||||
ZLIBLIB = $(WXDIR)/lib/libzlib.a
|
||||
PNGLIB = $(WXDIR)/lib/libpng.a
|
||||
JPEGLIB = $(WXDIR)/lib/libjpeg.a
|
||||
XPMLIB = $(WXDIR)/lib/libxpm.a
|
||||
TIFFLIB = $(WXDIR)/lib/libtiff.a
|
||||
|
||||
DOCDIR = $(WXDIR)/docs
|
||||
@ -236,27 +234,6 @@ JPEGOBJS = \
|
||||
$(JPEGDIR)/jquant2.$(OBJSUFF) \
|
||||
$(JPEGDIR)/jdmerge.$(OBJSUFF)
|
||||
|
||||
# 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)/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 \
|
||||
$(TIFFDIR)/tif_codec.o \
|
||||
@ -302,9 +279,9 @@ else
|
||||
endif
|
||||
|
||||
ifndef WXMAKINGDLL
|
||||
all: $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB)
|
||||
all: $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB)
|
||||
else
|
||||
all: $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB) $(WXDLL)
|
||||
all: $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(WXDLL)
|
||||
endif
|
||||
|
||||
ifndef WXMAKINGDLL
|
||||
@ -370,10 +347,6 @@ $(JPEGLIB): $(JPEGOBJS)
|
||||
$(AR) $(AROPTIONS) $@ $(JPEGOBJS)
|
||||
$(RANLIB) $@
|
||||
|
||||
$(XPMLIB): $(XPMOBJS)
|
||||
$(AR) $(AROPTIONS) $@ $(XPMOBJS)
|
||||
$(RANLIB) $@
|
||||
|
||||
$(TIFFLIB): $(TIFFOBJS)
|
||||
$(AR) $(AROPTIONS) $@ $(TIFFOBJS)
|
||||
$(RANLIB) $@
|
||||
@ -438,8 +411,6 @@ clean:
|
||||
-$(RM) ../png/*.bak
|
||||
-$(RM) ../jpeg/*.o
|
||||
-$(RM) ../jpeg/*.bak
|
||||
-$(RM) ../xpm/*.o
|
||||
-$(RM) ../xpm/*.bak
|
||||
-$(RM) ../tiff/*.o
|
||||
-$(RM) ../tiff/*.bak
|
||||
|
||||
@ -448,7 +419,6 @@ cleanall: clean
|
||||
-$(RM) $(ZLIBLIB)
|
||||
-$(RM) $(PNGLIB)
|
||||
-$(RM) $(JPEGLIB)
|
||||
-$(RM) $(XPMLIB)
|
||||
-$(RM) $(TIFFLIB)
|
||||
|
||||
ifdef WXMAKINGDLL
|
||||
|
@ -67,7 +67,6 @@ OPTIONS=
|
||||
|
||||
GENDIR=$(WXDIR)\src\generic
|
||||
COMMDIR=$(WXDIR)\src\common
|
||||
XPMDIR=$(WXDIR)\src\xpm
|
||||
OLEDIR=ole
|
||||
MSWDIR=$(WXDIR)\src\msw
|
||||
|
||||
@ -79,20 +78,8 @@ COMMONOBJS = \
|
||||
|
||||
MSWOBJS = #$ ExpandList("WXMSWOBJS");
|
||||
|
||||
XPMOBJECTS = $(XPMDIR)\crbuffri.obj\
|
||||
$(XPMDIR)\crdatfri.obj\
|
||||
$(XPMDIR)\create.obj $(XPMDIR)\crifrbuf.obj\
|
||||
$(XPMDIR)\crifrdat.obj\
|
||||
$(XPMDIR)\data.obj\
|
||||
$(XPMDIR)\hashtab.obj $(XPMDIR)\misc.obj\
|
||||
$(XPMDIR)\parse.obj $(XPMDIR)\rdftodat.obj\
|
||||
$(XPMDIR)\rdftoi.obj\
|
||||
$(XPMDIR)\rgb.obj $(XPMDIR)\scan.obj\
|
||||
$(XPMDIR)\simx.obj $(XPMDIR)\wrffrdat.obj\
|
||||
$(XPMDIR)\wrffrp.obj $(XPMDIR)\wrffri.obj
|
||||
|
||||
# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
|
||||
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) # $(XPMOBJECTS)
|
||||
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
|
||||
|
||||
all: $(LIBTARGET)
|
||||
|
||||
|
@ -92,8 +92,8 @@ BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib src\jpeg\Release\jpeg.lib src\tiff\Release\tiff.lib src\png\Release\png.lib src\xpm\Release\xpm.lib src\zlib\Release\zlib.lib /nologo /dll /machine:I386 /out:"ReleaseDll/wxmsw221.dll"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib src\jpeg\Release\jpeg.lib src\tiff\Release\tiff.lib src\png\Release\png.lib src\xpm\Release\xpm.lib src\zlib\Release\zlib.lib /nologo /dll /machine:I386 /out:"ReleaseDll/wxmsw221.dll"
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib src\jpeg\Release\jpeg.lib src\tiff\Release\tiff.lib src\png\Release\png.lib src\zlib\Release\zlib.lib /nologo /dll /machine:I386 /out:"ReleaseDll/wxmsw221.dll"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib src\jpeg\Release\jpeg.lib src\tiff\Release\tiff.lib src\png\Release\png.lib src\zlib\Release\zlib.lib /nologo /dll /machine:I386 /out:"ReleaseDll/wxmsw221.dll"
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxWinDll - Win32 Debug"
|
||||
|
||||
@ -118,8 +118,8 @@ BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib src\jpeg\Debug\jpeg.lib src\tiff\Debug\tiff.lib src\png\Debug\png.lib src\xpm\Debug\xpm.lib src\zlib\Debug\zlib.lib /dll /debug /machine:I386 /pdbtype:sept /out:"DebugDll/wxmsw221d.dll"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib src\jpeg\Debug\jpeg.lib src\tiff\Debug\tiff.lib src\png\Debug\png.lib src\xpm\Debug\xpm.lib src\zlib\Debug\zlib.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"DebugDll/wxmsw221d.dll"
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib src\jpeg\Debug\jpeg.lib src\tiff\Debug\tiff.lib src\png\Debug\png.lib src\zlib\Debug\zlib.lib /dll /debug /machine:I386 /pdbtype:sept /out:"DebugDll/wxmsw221d.dll"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib src\jpeg\Debug\jpeg.lib src\tiff\Debug\tiff.lib src\png\Debug\png.lib src\zlib\Debug\zlib.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"DebugDll/wxmsw221d.dll"
|
||||
|
||||
!ENDIF
|
||||
|
||||
|
@ -71,7 +71,7 @@
|
||||
$DLL_OR_LIB=Config("wxbase") ? "wxBase" : "wxWindows";
|
||||
$DLL_FLAGS=" ";
|
||||
#! actually this depends on the contents of setup.h
|
||||
$EXTRA_LIBS=Config("wxbase") ? "" : "xpm zlib png jpeg tiff";
|
||||
$EXTRA_LIBS=Config("wxbase") ? "" : "zlib png jpeg tiff";
|
||||
}
|
||||
|
||||
#! let's be smarter: first of all, if no extension is given, add .lib
|
||||
|
@ -82,11 +82,10 @@ LIBTARGET = $(WXLIB)\wx.lib
|
||||
DUMMY=dummydll
|
||||
# ODBCLIB = ..\..\contrib\odbc\odbc32.lib
|
||||
|
||||
EXTRATARGETS = xpm png zlib jpeg tiff
|
||||
EXTRATARGETSCLEAN = clean_xpm clean_png clean_zlib clean_jpeg clean_tiff
|
||||
EXTRATARGETS = png zlib jpeg tiff
|
||||
EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff
|
||||
GENDIR=$(WXDIR)\src\generic
|
||||
COMMDIR=$(WXDIR)\src\common
|
||||
XPMDIR=$(WXDIR)\src\xpm
|
||||
JPEGDIR=$(WXDIR)\src\jpeg
|
||||
TIFFDIR=$(WXDIR)\src\tiff
|
||||
MSWDIR=$(WXDIR)\src\msw
|
||||
@ -207,73 +206,6 @@ $(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
|
||||
}
|
||||
#$}
|
||||
|
||||
crbuffri.obj: $(XPMDIR)\crbuffri.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
crbuffrp.obj: $(XPMDIR)\crbuffrp.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
crdatfri.obj: $(XPMDIR)\crdatfri.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
crdatfrp.obj: $(XPMDIR)\crdatfrp.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
create.obj: $(XPMDIR)\create.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
crifrbuf.obj: $(XPMDIR)\crifrbuf.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
crifrdat.obj: $(XPMDIR)\crifrdat.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
crpfrbuf.obj: $(XPMDIR)\crpfrbuf.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
crpfrdat.obj: $(XPMDIR)\crpfrdat.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
# TODO: what to do about this clash of filename????
|
||||
#data.obj: $(XPMDIR)\data.c
|
||||
# *$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
hashtab.obj: $(XPMDIR)\hashtab.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
misc.obj: $(XPMDIR)\misc.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
parse.obj: $(XPMDIR)\parse.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
rdftodat.obj: $(XPMDIR)\rdftodat.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
rdftoi.obj: $(XPMDIR)\rdftoi.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
rdftop.obj: $(XPMDIR)\rdftop.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
rgb.obj: $(XPMDIR)\rgb.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
scan.obj: $(XPMDIR)\scan.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
simx.obj: $(XPMDIR)\simx.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
wrffrdat.obj: $(XPMDIR)\wrffrdat.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
wrffri.obj: $(XPMDIR)\wrffri.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
wrffrp.obj: $(XPMDIR)\wrffrp.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
|
||||
trees$(O)
|
||||
OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
|
||||
@ -323,16 +255,6 @@ uncompr.obj: uncompr.c zlib.h zconf.h
|
||||
zutil.obj: zutil.c zutil.h zlib.h zconf.h
|
||||
$(CC) -c $(CFLAGS) $*.c
|
||||
|
||||
xpm: .SYMBOLIC
|
||||
cd $(WXDIR)\src\xpm
|
||||
wmake -f makefile.wat all
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
clean_xpm: .SYMBOLIC
|
||||
cd $(WXDIR)\src\xpm
|
||||
wmake -f makefile.wat clean
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
png: .SYMBOLIC
|
||||
cd $(WXDIR)\src\png
|
||||
wmake -f makefile.wat all
|
||||
|
Loading…
Reference in New Issue
Block a user