projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add automatic rescaling to wxArtProvider
[wxWidgets.git]
/
src
/
os2
/
makefile.va
diff --git
a/src/os2/makefile.va
b/src/os2/makefile.va
index 561136fc398f6d8879a931d3941a222dde00ae7b..e8c55fb4d0020ef9e05e6adce2e0659387bc1d9f 100644
(file)
--- a/
src/os2/makefile.va
+++ b/
src/os2/makefile.va
@@
-533,8
+533,7
@@
OS2OBJS = \
..\os2\$D\utils.obj \
..\os2\$D\utilsexc.obj \
..\os2\$D\wave.obj \
..\os2\$D\utils.obj \
..\os2\$D\utilsexc.obj \
..\os2\$D\wave.obj \
- ..\os2\$D\window.obj \
- ..\os2\$D\xpmhand.obj
+ ..\os2\$D\window.obj
OS2LIBOBJS1 = \
accel.obj \
OS2LIBOBJS1 = \
accel.obj \
@@
-617,8
+616,7
@@
OS2LIBOBJS2 = \
utils.obj \
utilsexc.obj \
wave.obj \
utils.obj \
utilsexc.obj \
wave.obj \
- window.obj \
- xpmhand.obj
+ window.obj
HTMLOBJS = \
..\html\$D\helpctrl.obj \
HTMLOBJS = \
..\html\$D\helpctrl.obj \
@@
-670,7
+668,7
@@
HTMLLIBOBJS = \
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS)
# Normal, static library
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS)
# Normal, static library
-all: $(WXDIR)\include\wx\setup.h $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib png jpeg
xpm
tiff $(LIBTARGET)
+all: $(WXDIR)\include\wx\setup.h $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib png jpeg tiff $(LIBTARGET)
dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
@@
-971,7
+969,6
@@
$(OS2LIBOBJS2):
copy ..\os2\$D\utilsexc.obj
copy ..\os2\$D\wave.obj
copy ..\os2\$D\window.obj
copy ..\os2\$D\utilsexc.obj
copy ..\os2\$D\wave.obj
copy ..\os2\$D\window.obj
- copy ..\os2\$D\xpmhand.obj
# wxWindows library as DLL
dll:
# wxWindows library as DLL
dll:
@@
-1158,16
+1155,6
@@
clean_jpeg:
nmake -f makefile.va clean
cd $(WXDIR)\src\os2
nmake -f makefile.va clean
cd $(WXDIR)\src\os2
-xpm:
- cd $(WXDIR)\src\xpm
- nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
- cd $(WXDIR)\src\os2
-
-clean_xpm:
- cd $(WXDIR)\src\xpm
- nmake -f makefile.va clean
- cd $(WXDIR)\src\os2
-
tiff:
cd $(WXDIR)\src\tiff
nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
tiff:
cd $(WXDIR)\src\tiff
nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
@@
-1178,7
+1165,7
@@
clean_tiff:
nmake -f makefile.va clean
cd $(WXDIR)\src\os2
nmake -f makefile.va clean
cd $(WXDIR)\src\os2
-clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_
xpm clean_
tiff
+clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_tiff
erase /N $(GENDIR)\$D\*.obj
erase /N $(COMMDIR)\$D\*.obj
erase /N $(HTMLDIR)\$D\*.obj
erase /N $(GENDIR)\$D\*.obj
erase /N $(COMMDIR)\$D\*.obj
erase /N $(HTMLDIR)\$D\*.obj