From e81cf2eb73ad050182b9d22ce0b9b6d9318d50eb Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Wed, 7 May 2003 11:41:21 +0000 Subject: [PATCH] update makefile.sc for digital mars to use relative paths git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/sc.t | 13 ++++++++----- samples/mdi/makefile.sc | 2 +- src/makesc.env | 2 +- src/msw/makefile.sc | 9 +++++---- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/distrib/msw/tmake/sc.t b/distrib/msw/tmake/sc.t index 9ac6d5f8df..83efb90ed6 100644 --- a/distrib/msw/tmake/sc.t +++ b/distrib/msw/tmake/sc.t @@ -57,12 +57,14 @@ # This file was automatically generated by tmake # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T! -# Symantec C++ makefile for the msw objects +# Digital mars makefile +# was Symantec C++ makefile for the msw objects +# # called from src\makefile.sc # configuration section (see src\makefile.sc) ########################### -WXDIR = $(WXWIN) +WXDIR = ..\.. include ..\makesc.env @@ -117,10 +119,11 @@ clean_msw: -del $(COMMDIR)\*.obj -del $(MSWDIR)\*.obj -del $(GENDIR)\*.obj - -del $(HTMLDIR)\*.obj + -del $(HTMLDIR)\*.obj -del *.obj - -del ole\*.obj - -del $(LIBTARGET) + -del *.sym + -del ole\*.obj + -del $(LIBTARGET) png: make -f $(WXDIR)\src\png\makefile.sc FINAL=$(FINAL) diff --git a/samples/mdi/makefile.sc b/samples/mdi/makefile.sc index 16cc78c81f..f8bbfdfd9d 100644 --- a/samples/mdi/makefile.sc +++ b/samples/mdi/makefile.sc @@ -1,4 +1,4 @@ # Symantec C++ makefile -WXDIR = $(WXWIN) +WXDIR = ..\.. TARGET=mdi include $(WXDIR)\src\makeprog.sc diff --git a/src/makesc.env b/src/makesc.env index 1bf29f4b1a..e69463dfe7 100644 --- a/src/makesc.env +++ b/src/makesc.env @@ -2,7 +2,7 @@ # and digital mars successor (http://www.digitalmars.com) SC_SUFFIX=_sc -WXDIR = $(WXWIN) +####WXDIR = $(WXWIN) INCDIR = $(WXDIR)\include MSWINCDIR = $(WXDIR)\include\wx\msw ARCHINCDIR = $(WXDIR)\lib\$(SC_SUFFIX) diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc index 0fc2eddc54..4ebcda518a 100644 --- a/src/msw/makefile.sc +++ b/src/msw/makefile.sc @@ -8,7 +8,7 @@ # configuration section (see src\makefile.sc) ########################### -WXDIR = $(WXWIN) +WXDIR = ..\.. include ..\makesc.env @@ -349,10 +349,11 @@ clean_msw: -del $(COMMDIR)\*.obj -del $(MSWDIR)\*.obj -del $(GENDIR)\*.obj - -del $(HTMLDIR)\*.obj + -del $(HTMLDIR)\*.obj -del *.obj - -del ole\*.obj - -del $(LIBTARGET) + -del *.sym + -del ole\*.obj + -del $(LIBTARGET) png: make -f $(WXDIR)\src\png\makefile.sc FINAL=$(FINAL)