update to make digitalmars compile/link make clean

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/makeprog.sc b/src/makeprog.sc
index 31562629b778d0a0a61c691c95209d6fb5fc2210..2a9a5fbe15fca319ca0abbe033af1180e4f5a864 100644 (file)
--- a/src/makeprog.sc
+++ b/src/makeprog.sc
@@ -7,7 +7,7 @@ INCLUDE=$(INCDIR)
 include $(WXDIR)\src\makesc.env
 
 $(TARGET).exe: $(TARGET).obj $(TARGET).res
-       link $(LDFLAGS) /DELEXECUTABLE /RC $*, $@, $*, $(LIBS)
+       link $(LDFLAGS) /DELEXECUTABLE /RC  $*, $@, $*, $(LIBDIR)\ $(LIBS)
     
 
 sc32.def:

diff --git a/src/makesc.env b/src/makesc.env
index 3e76e640f4244710e613e316e14aa34153059f5c..1bf29f4b1a412e2eaf7c38993bf3e0722d42322b 100644 (file)
--- a/src/makesc.env
+++ b/src/makesc.env
@@ -7,9 +7,9 @@ INCDIR = $(WXDIR)\include
 MSWINCDIR = $(WXDIR)\include\wx\msw
 ARCHINCDIR = $(WXDIR)\lib\$(SC_SUFFIX)
 LIBDIR = $(WXDIR)\lib
-WXLIB = $(LIBDIR)\wx$(SC_SUFFIX).lib
+WXLIB = wx$(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
 OBJSUFF = obj

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 852d757876f99186dfc7ecb1c91058e68d0178d8..e32a27a733a808538676d5048b2b3987c8d982d1 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -320,7 +320,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\window.obj
 
 # 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
 
@@ -331,16 +331,17 @@ MAKEARCHDIR:
     @if not exist $(ARCHINCDIR)\wx\setup.h copy $(MSWINCDIR)\setup.h $(ARCHINCDIR)\wx\setup.h
 
 MAKEWINSOCKLIB:
-      @if not exist $(WINSOCKLIB) implib  /s $(WINSOCKLIB) $(WINDIR)\system32\winsock.dll
-##    implib /system /v /suffix /Ic:\wx\dm\include\win32 $(WINSOCKLIB) $(WINDIR)\system32\winsock.dll
-##    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\wsock32.dll
 ##@if not exist $(WINSOCKLIB)  
 
 $(LIBTARGET): $(OBJECTS)
        -del $(LIBTARGET)
        *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 $(MSWDIR)\*.obj
        -del $(GENDIR)\*.obj