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:
@@ -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)
|
||||
|
Reference in New Issue
Block a user