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

update to make digitalmars compile/link make clean

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott 2003-04-24 21:08:21 +00:00
parent e9196d9c63
commit ee252037cf
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/makeprog.sc
View File

@ -7,7 +7,7 @@ INCLUDE=$(INCDIR)
include $(WXDIR)\src\makesc.env include $(WXDIR)\src\makesc.env
$(TARGET).exe: $(TARGET).obj $(TARGET).res $(TARGET).exe: $(TARGET).obj $(TARGET).res
link $(LDFLAGS) /DELEXECUTABLE /RC $*, $@, $*, $(LIBS) link $(LDFLAGS) /DELEXECUTABLE /RC $*, $@, $*, $(LIBDIR)\ $(LIBS)
sc32.def: sc32.def:

4
src/makesc.env
View File

@ -7,9 +7,9 @@ INCDIR = $(WXDIR)\include
MSWINCDIR = $(WXDIR)\include\wx\msw MSWINCDIR = $(WXDIR)\include\wx\msw
ARCHINCDIR = $(WXDIR)\lib\$(SC_SUFFIX) ARCHINCDIR = $(WXDIR)\lib\$(SC_SUFFIX)
LIBDIR = $(WXDIR)\lib LIBDIR = $(WXDIR)\lib
WXLIB = $(LIBDIR)\wx$(SC_SUFFIX).lib WXLIB = wx$(SC_SUFFIX).lib
WINSOCKLIB = $(LIBDIR)\winsock$(SC_SUFFIX).lib WINSOCKLIB = $(LIBDIR)\winsock$(SC_SUFFIX).lib
SUPPORTLIBS = $(LIBDIR)\png$(SC_SUFFIX).lib $(LIBDIR)\tiff$(SC_SUFFIX).lib $(LIBDIR)\jpeg$(SC_SUFFIX).lib $(LIBDIR)\zlib$(SC_SUFFIX).lib SUPPORTLIBS = png$(SC_SUFFIX) tiff$(SC_SUFFIX) jpeg$(SC_SUFFIX) zlib$(SC_SUFFIX)
SRCSUFF = cpp SRCSUFF = cpp
OBJSUFF = obj OBJSUFF = obj

11
src/msw/makefile.sc
View File

@ -320,7 +320,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
$(MSWDIR)\window.obj $(MSWDIR)\window.obj
# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc. # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) $(WINSOCKLIB) OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
all: MAKEARCHDIR MAKEWINSOCKLIB $(LIBTARGET) zlib png jpeg tiff regex all: MAKEARCHDIR MAKEWINSOCKLIB $(LIBTARGET) zlib png jpeg tiff regex
@ -331,16 +331,17 @@ MAKEARCHDIR:
@if not exist $(ARCHINCDIR)\wx\setup.h copy $(MSWINCDIR)\setup.h $(ARCHINCDIR)\wx\setup.h @if not exist $(ARCHINCDIR)\wx\setup.h copy $(MSWINCDIR)\setup.h $(ARCHINCDIR)\wx\setup.h
MAKEWINSOCKLIB: MAKEWINSOCKLIB:
@if not exist $(WINSOCKLIB) implib /s $(WINSOCKLIB) $(WINDIR)\system32\winsock.dll implib /s $(WINSOCKLIB) $(WINDIR)\system32\wsock32.dll
## implib /system /v /suffix /Ic:\wx\dm\include\win32 $(WINSOCKLIB) $(WINDIR)\system32\winsock.dll ### implib /system /v /suffix /Ic:\wx\dm\include\win32\ $(WINSOCKLIB) $(WINDIR)\system32\wsock32.dll
## implib /s $(WINSOCKLIB) $(WINDIR)\system32\winsock.dll
##@if not exist $(WINSOCKLIB) ##@if not exist $(WINSOCKLIB)
$(LIBTARGET): $(OBJECTS) $(LIBTARGET): $(OBJECTS)
-del $(LIBTARGET) -del $(LIBTARGET)
*lib /PAGESIZE:512 $(LIBTARGET) y $(OBJECTS), nul; *lib /PAGESIZE:512 $(LIBTARGET) y $(OBJECTS), nul;
clean: clean_zlib clean_png clean_jpeg clean_tiff clean_regex clean: clean_msw clean_zlib clean_png clean_jpeg clean_tiff clean_regex
clean_msw:
-del $(COMMDIR)\*.obj -del $(COMMDIR)\*.obj
-del $(MSWDIR)\*.obj -del $(MSWDIR)\*.obj
-del $(GENDIR)\*.obj -del $(GENDIR)\*.obj