Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions 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@20336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2003-04-24 21:16:56 +00:00
parent ee252037cf
commit 2cea8d2558
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
distrib/msw/tmake/sc.t
View File

@@ -100,8 +100,10 @@ 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 if not exist $(WINSOCKLIB) 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
## bug here on win98 no system32 ??
## implib doesn't work anyway
## implib /s $(WINSOCKLIB) $(WINDIR)\system32\winsock.dll ## implib /s $(WINSOCKLIB) $(WINDIR)\system32\winsock.dll
##@if not exist $(WINSOCKLIB) ##@if not exist $(WINSOCKLIB)
@@ -109,12 +111,15 @@ $(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
-del $(HTMLDIR)\*.obj -del $(HTMLDIR)\*.obj
-del *.obj -del *.obj
-del ole\*.obj
-del $(LIBTARGET) -del $(LIBTARGET)
png: png:

10
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) OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) $(WINSOCKLIB)
all: MAKEARCHDIR MAKEWINSOCKLIB $(LIBTARGET) zlib png jpeg tiff regex all: MAKEARCHDIR MAKEWINSOCKLIB $(LIBTARGET) zlib png jpeg tiff regex
@@ -331,8 +331,11 @@ 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:
implib /s $(WINSOCKLIB) $(WINDIR)\system32\wsock32.dll if not exist $(WINSOCKLIB) implib /s $(WINSOCKLIB) $(WINDIR)\system32\wsock32.dll
### implib /system /v /suffix /Ic:\wx\dm\include\win32\ $(WINSOCKLIB) $(WINDIR)\system32\wsock32.dll ## implib /system /v /suffix /Ic:\wx\dm\include\win32 $(WINSOCKLIB) $(WINDIR)\system32\wsock32.dll
## bug here on win98 no system32 ??
## implib doesn't work anyway
## implib /s $(WINSOCKLIB) $(WINDIR)\system32\winsock.dll
##@if not exist $(WINSOCKLIB) ##@if not exist $(WINSOCKLIB)
$(LIBTARGET): $(OBJECTS) $(LIBTARGET): $(OBJECTS)
@@ -347,6 +350,7 @@ clean_msw:
-del $(GENDIR)\*.obj -del $(GENDIR)\*.obj
-del $(HTMLDIR)\*.obj -del $(HTMLDIR)\*.obj
-del *.obj -del *.obj
-del ole\*.obj
-del $(LIBTARGET) -del $(LIBTARGET)
png: png: