relative path to wxwin in samples for Digital Mars (fixes SF bug 757845)

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

diff --git a/samples/access/Makefile.sc b/samples/access/Makefile.sc
index cf68c4ef9314e24c7095abb069cff53ed945382d..d4c38911c464a9b80267ea1ce0b1da2f3bc8da24 100644 (file)
--- a/samples/access/Makefile.sc
+++ b/samples/access/Makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=accesstest
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/artprov/Makefile.sc b/samples/artprov/Makefile.sc
index 926f07622b58e2aae118bace619b6096ad0776b1..928f4934866a3db895f365554826198d15317c45 100644 (file)
--- a/samples/artprov/Makefile.sc
+++ b/samples/artprov/Makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=arttest
 OBJECTS = $(TARGET).obj artbrows.obj 
 EXTRALIBS =

diff --git a/samples/calendar/makefile.sc b/samples/calendar/makefile.sc
index 8d8dcdfabea52212d051420f7b46e9212c87b1f6..fb1180676ac5abfabf0dd54f77a18431a3cca3b3 100644 (file)
--- a/samples/calendar/makefile.sc
+++ b/samples/calendar/makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=calendar
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/caret/Makefile.sc b/samples/caret/Makefile.sc
index 835230e11488e5f6f35fac93fc0499219dc8fabf..536ddadb6f27bfeef3ef104774deaaa5370c58ab 100644 (file)
--- a/samples/caret/Makefile.sc
+++ b/samples/caret/Makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=caret
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/checklst/makefile.sc b/samples/checklst/makefile.sc
index 210074b44e0dc11c2e44506603604a2526ba2d6d..319c5cd35e23a2fe0b5d5abfe06aab64cfba3bba 100644 (file)
--- a/samples/checklst/makefile.sc
+++ b/samples/checklst/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=checklst
 OBJECTS = $(TARGET).obj

diff --git a/samples/config/Makefile.sc b/samples/config/Makefile.sc
index 947f5cda28e8665f8670149793970fae8c4a9ebe..4c14a167eede7be9457b1a0007037290a4c3cc44 100644 (file)
--- a/samples/config/Makefile.sc
+++ b/samples/config/Makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=conftest
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/controls/makefile.sc b/samples/controls/makefile.sc
index d3bd5732e449fbffdddbbefd3fe66bb4788ff363..7623577efc0c2edc06e8bf067d32c412575e1bb8 100644 (file)
--- a/samples/controls/makefile.sc
+++ b/samples/controls/makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=controls
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/db/makefile.sc b/samples/db/makefile.sc
index 8945a67c7453862e1be961340ca76bf2bb3c2881..7ad74634a6204296e3869c29153f87e3af7162e9 100644 (file)
--- a/samples/db/makefile.sc
+++ b/samples/db/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=dbtest
 OBJECTS = $(TARGET).obj listdb.obj

diff --git a/samples/dialogs/makefile.sc b/samples/dialogs/makefile.sc
index 96e44a6ae42955db4c9ed83124a2ab4b76ba1b56..d8dd828609bf7c8b4333054cbd97b152d38b4337 100644 (file)
--- a/samples/dialogs/makefile.sc
+++ b/samples/dialogs/makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows.25
+WXDIR=..\..
 TARGET=dialogs
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/dialup/makefile.sc b/samples/dialup/makefile.sc
index 290d82addd23dc61f5eeb985f72c45bfa0b047d1..ed6a3c30540bbe06a0ab6ff7e73da6b402495d20 100644 (file)
--- a/samples/dialup/makefile.sc
+++ b/samples/dialup/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=nettest
 OBJECTS = $(TARGET).obj

diff --git a/samples/dnd/makefile.sc b/samples/dnd/makefile.sc
index edde5c7c0712c199b9ff238d047d8645bda5d98c..9c4baf90ada571deef73cd30648b9fc2628753dd 100644 (file)
--- a/samples/dnd/makefile.sc
+++ b/samples/dnd/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=dnd
 OBJECTS = $(TARGET).obj

diff --git a/samples/docview/makefile.sc b/samples/docview/makefile.sc
index d28750908c25de1cbf4149b5444c84f2f7383bd9..8ce6b49d530e9f36b4ae5cee19c3c1dd80d8b194 100644 (file)
--- a/samples/docview/makefile.sc
+++ b/samples/docview/makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=docview
 OBJECTS = $(TARGET).obj doc.obj view.obj 
 EXTRALIBS =

diff --git a/samples/docvwmdi/makefile.sc b/samples/docvwmdi/makefile.sc
index 9eff0f89c0946bcec8805f467fc2a5fedcb1feb3..5b89e188f2643ea803d50873e3e4ddfd149d453c 100644 (file)
--- a/samples/docvwmdi/makefile.sc
+++ b/samples/docvwmdi/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=docview
 OBJECTS = $(TARGET).obj view.obj doc.obj

diff --git a/samples/dragimag/makefile.sc b/samples/dragimag/makefile.sc
index 1cf04cc4802ac4e6f52f6761cd35e579117fe3c1..de64a908399d49c0a3df1cf52e7a5c99fe4bbca7 100644 (file)
--- a/samples/dragimag/makefile.sc
+++ b/samples/dragimag/makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=dragimag
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/drawing/makefile.sc b/samples/drawing/makefile.sc
index e36be3cbf179764d38c3a30b7bb4c6b831deb12c..c009cae882a9d99337cf990520c37313c7c82e41 100644 (file)
--- a/samples/drawing/makefile.sc
+++ b/samples/drawing/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=drawing
 OBJECTS = $(TARGET).obj

diff --git a/samples/dynamic/makefile.sc b/samples/dynamic/makefile.sc
index 4121cbbb834088335b0c64abaf73a36eb64cb121..56bec95d0e7e5e7a745716a97bcb3af87e952848 100644 (file)
--- a/samples/dynamic/makefile.sc
+++ b/samples/dynamic/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=dynamic
 OBJECTS = $(TARGET).obj

diff --git a/samples/erase/makefile.sc b/samples/erase/makefile.sc
index 9540426da01865879d4bd8ffc1aa339c7faff296..72c1953e5ab90c620a8f8b0cc36b740e98663f4a 100644 (file)
--- a/samples/erase/makefile.sc
+++ b/samples/erase/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=erase
 OBJECTS = $(TARGET).obj

diff --git a/samples/event/makefile.sc b/samples/event/makefile.sc
index a3aa39afecb81d1615ba00c6c5fc0b754577e5e4..450c1c38954aac0dbd22a36039f9db02bad32697 100644 (file)
--- a/samples/event/makefile.sc
+++ b/samples/event/makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=event
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/exec/makefile.sc b/samples/exec/makefile.sc
index 0276d80e444ee61f4396fdfa16419db4f72f30b0..04ebb1facedfe8727fbc063688eb48f3aed0af84 100644 (file)
--- a/samples/exec/makefile.sc
+++ b/samples/exec/makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=exec
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/font/makefile.sc b/samples/font/makefile.sc
index 63e95e750ffc15f120b379897d0fe6989dd26491..fea69b76b260635d8d1e918ab6e7b07e9b9f2cad 100644 (file)
--- a/samples/font/makefile.sc
+++ b/samples/font/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=font
 OBJECTS = $(TARGET).obj

diff --git a/samples/grid/makefile.sc b/samples/grid/makefile.sc
index 56c4195745f27d6c800246b34e5f31b39a42f94d..a2562850c90c52d7507fbde55d8c7ad3008cbb43 100644 (file)
--- a/samples/grid/makefile.sc
+++ b/samples/grid/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=griddemo
 OBJECTS= $(TARGET).obj

diff --git a/samples/help/makefile.sc b/samples/help/makefile.sc
index eb1323c243021885cf58fd92dc6d58e3abfb13b2..fecaba37321fb8e97795b98241d16927550333c2 100644 (file)
--- a/samples/help/makefile.sc
+++ b/samples/help/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=demo
 OBJECTS = $(TARGET).obj

diff --git a/samples/html/about/Makefile.sc b/samples/html/about/Makefile.sc
index 43325cdd80dd7beda4df31b3385ca8f2d8c3d6fd..56cb9a5215b45b2f8de5ec77c93b2d5cfabdfe1a 100644 (file)
--- a/samples/html/about/Makefile.sc
+++ b/samples/html/about/Makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\..\wxWindows
+WXDIR=..\..\..
 TARGET=about
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/html/help/Makefile.sc b/samples/html/help/Makefile.sc
index 362bea839a4c2c0befcd38a8b9039799cbf8c675..c6a9340e087518c62a57204224e5c4c52f27d503 100644 (file)
--- a/samples/html/help/Makefile.sc
+++ b/samples/html/help/Makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\..\wxWindows
+WXDIR=..\..\..
 TARGET=help
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/html/printing/Makefile.sc b/samples/html/printing/Makefile.sc
index cbeee7003fa35e828735cfe0a0c5d01fb6b279db..e415fd2f286f9590bd4811176746f4ea6ff46a56 100644 (file)
--- a/samples/html/printing/Makefile.sc
+++ b/samples/html/printing/Makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\..\wxWindows
+WXDIR=..\..\..
 TARGET=printing
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/html/test/makefile.sc b/samples/html/test/makefile.sc
index 1c9ffc2d9038944af3a1d0e386128f2412d4e327..894f9fd9f3e7146955b8176f7fe89519ed1a2bda 100644 (file)
--- a/samples/html/test/makefile.sc
+++ b/samples/html/test/makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\..\wxWindows
+WXDIR=..\..\..
 TARGET=test
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/html/virtual/Makefile.sc b/samples/html/virtual/Makefile.sc
index c01f4f3efc5ef0d5ddc0ccce41bb3bd36de66c2a..2010b7d4229bb1e723340e480ed6c4d71ef4bcb9 100644 (file)
--- a/samples/html/virtual/Makefile.sc
+++ b/samples/html/virtual/Makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\..\wxWindows
+WXDIR=..\..\..
 TARGET=virtual
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/html/widget/Makefile.sc b/samples/html/widget/Makefile.sc
index 89e46e282472902f605d9bba81fb660ee4df306f..50e13bfc246bce0ed7443431a730310824005828 100644 (file)
--- a/samples/html/widget/Makefile.sc
+++ b/samples/html/widget/Makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\..\wxWindows
+WXDIR=..\..\..
 TARGET=widget
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/html/zip/Makefile.sc b/samples/html/zip/Makefile.sc
index e677f99e15bb58a2e0dab390b43a193952b750cd..98dcb9e7989defd2717b155047fe30766f9288d1 100644 (file)
--- a/samples/html/zip/Makefile.sc
+++ b/samples/html/zip/Makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\..\wxWindows
+WXDIR=..\..\..
 TARGET=zip
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/image/makefile.sc b/samples/image/makefile.sc
index 91c323c5229a46f6274a0cb76c438806d1ea0668..6460f2130b9a082c593aebafa044eead6a269ffd 100644 (file)
--- a/samples/image/makefile.sc
+++ b/samples/image/makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=image
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/internat/makefile.sc b/samples/internat/makefile.sc
index a2e6f625342e1d32ba3353804053a08cf9967660..516a0b574d2b92921a68bc73185d48d67a076c2c 100644 (file)
--- a/samples/internat/makefile.sc
+++ b/samples/internat/makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=internat
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/ipc/client.sc b/samples/ipc/client.sc
index 19aa06f3d00fecb335dec87feaf387c53f02eeec..b69e49e3d1d5a41f3fa69c52d93d0d882599bc7a 100644 (file)
--- a/samples/ipc/client.sc
+++ b/samples/ipc/client.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 TARGET=client
 OBJECTS=$(TARGET).obj
 EXTRALIBS=

diff --git a/samples/ipc/server.sc b/samples/ipc/server.sc
index f43b26fd1fd9b3ba84fab43643029b98c7fc8757..c46ba1a3493bf98fdd5bc5add44844de3421797b 100644 (file)
--- a/samples/ipc/server.sc
+++ b/samples/ipc/server.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 TARGET=server
 OBJECTS=$(TARGET).obj
 EXTRALIBS=

diff --git a/samples/joytest/makefile.sc b/samples/joytest/makefile.sc
index 32df4f5503a506eebda504a2278bea7baf839c27..bcacd48b3ac4cf4144029e5d7a041fcf8f7c3ea6 100644 (file)
--- a/samples/joytest/makefile.sc
+++ b/samples/joytest/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 
 TARGET=joytest

diff --git a/samples/keyboard/makefile.sc b/samples/keyboard/makefile.sc
index dd90d5879352abb0debb34da5ecb99436ced5cda..227437be279fe689db888cfd2594f911033ada1a 100644 (file)
--- a/samples/keyboard/makefile.sc
+++ b/samples/keyboard/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=keyboard
 OBJECTS = $(TARGET).obj

diff --git a/samples/layout/makefile.sc b/samples/layout/makefile.sc
index 3dc8b4f7c75d8c2a37ed22ace679138e56d8b008..6e67c4ad940c9d71f130128a4fa1c69ba4faff8e 100644 (file)
--- a/samples/layout/makefile.sc
+++ b/samples/layout/makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=layout
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/listctrl/makefile.sc b/samples/listctrl/makefile.sc
index f9798e848950584a92afdd3b9be5efb4f4bf5d7f..2335fe68dde8b35448f25efac2259fc38504d8ae 100644 (file)
--- a/samples/listctrl/makefile.sc
+++ b/samples/listctrl/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=listtest
 OBJECTS = $(TARGET).obj

diff --git a/samples/menu/makefile.sc b/samples/menu/makefile.sc
index 45d818c50525bce4938e51efea42eaecf3d67f1d..44cd1ae98e1c28d51cba6289abea5f6666b33333 100644 (file)
--- a/samples/menu/makefile.sc
+++ b/samples/menu/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=menu
 OBJECTS = $(TARGET).obj

diff --git a/samples/minifram/makefile.sc b/samples/minifram/makefile.sc
index 3efa80cd3c1c1854f04f249b10f8bdfb48c4e61e..c2a8fcbe3c3cee2c488a639f779ca5585e82cd91 100644 (file)
--- a/samples/minifram/makefile.sc
+++ b/samples/minifram/makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=minifram
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/nativdlg/makefile.sc b/samples/nativdlg/makefile.sc
index 8458e846f9c2f8672569b0291af04b1ad9466d5e..1bee812f82a097bd6bf6f964764581c5b4766cd2 100644 (file)
--- a/samples/nativdlg/makefile.sc
+++ b/samples/nativdlg/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=nativdlg
 OBJECTS = $(TARGET).obj

diff --git a/samples/notebook/makefile.sc b/samples/notebook/makefile.sc
index 20174a385bba82d9d77ebe556592f8a8101aa482..64584b500550b2dd1f3671aa10200cc29bf8db18 100644 (file)
--- a/samples/notebook/makefile.sc
+++ b/samples/notebook/makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=notebook
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/oleauto/makefile.sc b/samples/oleauto/makefile.sc
index bda02c2d7f29e5082af2f77bdb59cf130c01dca0..9dcf639543ac6f174e68786c23c41b311ccae272 100644 (file)
--- a/samples/oleauto/makefile.sc
+++ b/samples/oleauto/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=oleauto
 OBJECTS = $(TARGET).obj

diff --git a/samples/ownerdrw/makefile.sc b/samples/ownerdrw/makefile.sc
index b18de3fa44261d49b47b343aaab4ad5896703a1c..62c31c877ddffa18a676e2bf4fdf1eb70d50f14b 100644 (file)
--- a/samples/ownerdrw/makefile.sc
+++ b/samples/ownerdrw/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=ownerdrw
 OBJECTS = $(TARGET).obj

diff --git a/samples/png/Makefile.sc b/samples/png/Makefile.sc
index d8df92e36be3bc76809a183bff48b9868669ab2e..1bac49df28225c5e896becca2ec4cfda1c89cbc7 100644 (file)
--- a/samples/png/Makefile.sc
+++ b/samples/png/Makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=pngdemo
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/printing/makefile.sc b/samples/printing/makefile.sc
index 5b1c6db309156094e1cff0a89a2e98023ae51cb9..6119daafd6a1358ab5bf32345f6dea03c17c42ad 100644 (file)
--- a/samples/printing/makefile.sc
+++ b/samples/printing/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=printing
 OBJECTS = $(TARGET).obj

diff --git a/samples/propsize/makefile.sc b/samples/propsize/makefile.sc
index dccdd8edd4ccf049ff581adca7387cd4ddee72b9..a6a28d7a580b97df4463cefa2e0a2687d07bbd3a 100644 (file)
--- a/samples/propsize/makefile.sc
+++ b/samples/propsize/makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=propsize
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/regtest/makefile.sc b/samples/regtest/makefile.sc
index b1de45d9135730d763368c2ca0f6a6c404563917..202b0caf7e216e00fb801d488ed8e0c8cda0c26a 100644 (file)
--- a/samples/regtest/makefile.sc
+++ b/samples/regtest/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=regtest
 OBJECTS = $(TARGET).obj

diff --git a/samples/richedit/makefile.sc b/samples/richedit/makefile.sc
index a913070215390685c6e5d526f0067abd247ab2e0..37bc3e9f769493141517e0c81d5524003e35eeed 100644 (file)
--- a/samples/richedit/makefile.sc
+++ b/samples/richedit/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=wxlayout
 OBJECTS = wxLayout.obj kbList.obj wxllist.obj wxlparser.obj wxlwindow.obj

diff --git a/samples/rotate/makefile.sc b/samples/rotate/makefile.sc
index 73b688953a5f6e38fa56daf5d6ca6de046fb79b8..9e189a3e12dfee214811bd04ab73b645d59d2dbe 100644 (file)
--- a/samples/rotate/makefile.sc
+++ b/samples/rotate/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=rotate
 OBJECTS = $(TARGET).obj

diff --git a/samples/sashtest/makefile.sc b/samples/sashtest/makefile.sc
index 21817b034f60c804a4eb18b7352608cf1baf9769..12578da19d64969450d1769ae1cd78deb28f67c5 100644 (file)
--- a/samples/sashtest/makefile.sc
+++ b/samples/sashtest/makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=sashtest
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/scroll/makefile.sc b/samples/scroll/makefile.sc
index c7225c030aceca91a4d3847f792d9010a89ad647..97673ff075837bfe4598eb3ea6a58afc8c689d14 100644 (file)
--- a/samples/scroll/makefile.sc
+++ b/samples/scroll/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=scroll
 OBJECTS = $(TARGET).obj

diff --git a/samples/scrollsub/makefile.sc b/samples/scrollsub/makefile.sc
index bd5a3490ef5e0a4cff3747d32479831b12fdde89..0f75a6920d6e6b3a84f5339f9a094a646d60e84e 100644 (file)
--- a/samples/scrollsub/makefile.sc
+++ b/samples/scrollsub/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=scrollsub
 OBJECTS = $(TARGET).obj

diff --git a/samples/shaped/makefile.sc b/samples/shaped/makefile.sc
index 682c5466796d075bf0cef8d569e960581d03ad1c..d40079553dcedfc2bd6c82b8347014922b3b386c 100644 (file)
--- a/samples/shaped/makefile.sc
+++ b/samples/shaped/makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=shaped
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/sockets/client.sc b/samples/sockets/client.sc
index 02eca76983aba931d26e5ef396b1753d5e3e0bdc..4ada6e8ca26f4677e129e3e8bff7768b40a3ba54 100644 (file)
--- a/samples/sockets/client.sc
+++ b/samples/sockets/client.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=client
 OBJECTS = $(TARGET).obj

diff --git a/samples/sockets/makefile.sc b/samples/sockets/makefile.sc
index 38b713e7a3daa188633e5f1e47e46abd9a81b8dd..9a43c3bcb360ab51a86a188cfd633dcb43d6b15a 100644 (file)
--- a/samples/sockets/makefile.sc
+++ b/samples/sockets/makefile.sc
@@ -1,4 +1,8 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
-EXTRALIBS=
-include $(WXDIR)\src\makeprog.sc
+all:
+        make -f client.sc
+        make -f server.sc
+
+clean:
+        make -f client.sc clean
+        make -f server.sc clean

diff --git a/samples/sockets/server.sc b/samples/sockets/server.sc
index 253983dbd53d43a9834fbe0d671a479f4d23dbd1..faff57b3cee6f504b0d15efdebd28414ee377c09 100644 (file)
--- a/samples/sockets/server.sc
+++ b/samples/sockets/server.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=server
 OBJECTS = $(TARGET).obj

diff --git a/samples/splitter/makefile.sc b/samples/splitter/makefile.sc
index b867be6c5ed728a47961e2ac80c013d6b1a41447..4b5b66b06f4a92783ba2e6a51b96af2e9585b2d0 100644 (file)
--- a/samples/splitter/makefile.sc
+++ b/samples/splitter/makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=splitter
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/statbar/makefile.sc b/samples/statbar/makefile.sc
index b52e936902d46124af602cf60d427d2fe7e7f552..0f0374c7c04e8016c0fdf3564360d3ddc6ca4302 100644 (file)
--- a/samples/statbar/makefile.sc
+++ b/samples/statbar/makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=statbar
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/taskbar/makefile.sc b/samples/taskbar/makefile.sc
index 5eb654b8dce69ff4e73593f04574aa5f554046fe..65d7e96908e23bae7f793fe4fa5ec2b8f554a0dd 100644 (file)
--- a/samples/taskbar/makefile.sc
+++ b/samples/taskbar/makefile.sc
@@ -1,5 +1,5 @@
 #Digital Mars (was Symantec) C++ makefile 
-WXDIR = $(WXWIN)
+WXDIR = ..\..
 EXTRALIBS=
 TARGET=tbtest
 OBJECTS = $(TARGET).obj

diff --git a/samples/text/Makefile.sc b/samples/text/Makefile.sc
index dac57b1a75856256edda3b26aaf8f288fc2d1eb7..d0c3b331090edf43e5b8b629a082e2a84819d639 100644 (file)
--- a/samples/text/Makefile.sc
+++ b/samples/text/Makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=text
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/thread/makefile.sc b/samples/thread/makefile.sc
index 58539802e0d8e2b519833072102a691066ea6cc0..839478d57d02a45b4e7a5f22c075ec0b6e43951f 100644 (file)
--- a/samples/thread/makefile.sc
+++ b/samples/thread/makefile.sc
@@ -1,37 +1,9 @@
 # Purpose: makefile for thread example (Symantec C++)
 # Created: 2000-03-15
 
-WXDIR = $(WXWIN)
-WXLIB = $(WXDIR)\lib\wx.lib
-INCDIR = $(WXDIR)\include
-INCLUDE=$(INCDIR)
+WXDIR = ..\..
 TARGET=thread
-
-include $(WXDIR)\src\makesc.env
-
-thread.exe: thread.obj $(DEFFILE) thread.res
-       *$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
-    *$(RC) -k thread.res
-
-sc32.def:
-     echo EXETYPE NT > sc32.def
-     echo SUBSYSTEM WINDOWS >> sc32.def
-
-sc16.def:
-     echo NAME $(TARGET) > sc16.def
-     echo EXETYPE WINDOWS >> sc16.def
-     echo STUB         'WINSTUB.EXE' >> sc16.def
-     echo CODE         PRELOAD MOVEABLE DISCARDABLE >> sc16.def
-     echo DATA         PRELOAD MOVEABLE MULTIPLE >> sc16.def
-     echo HEAPSIZE     1024 >> sc16.def
-     echo STACKSIZE    8192 >> sc16.def
-
-clean:
-    -del *.obj
-       -del *.exe
-       -del *.res
-       -del *.map
-       -del *.rws
-    -del sc32.def
-    -del sc16.def
+OBJECTS = $(TARGET).obj
+EXTRALIBS =
+include $(WXDIR)\src\makeprog.sc
 

diff --git a/samples/toolbar/makefile.sc b/samples/toolbar/makefile.sc
index 8c8d2eb55ca915203235d133deadfb2ff09eb262..4a1c7b4811a4a0ed9db399a20883c55f93601933 100644 (file)
--- a/samples/toolbar/makefile.sc
+++ b/samples/toolbar/makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=toolbar
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/treectrl/makefile.sc b/samples/treectrl/makefile.sc
index 350df570f7eaa0ac5a7349c883026cc550168de3..a19cdce13d4969d04ed73c48bc78d6f31b4dd6e3 100644 (file)
--- a/samples/treectrl/makefile.sc
+++ b/samples/treectrl/makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=treetest
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/typetest/makefile.sc b/samples/typetest/makefile.sc
index 0e7de742adad19c183033ca6527b57b1161a9d80..6f782f2e46194e102be43ad515a56cc4afdfc838 100644 (file)
--- a/samples/typetest/makefile.sc
+++ b/samples/typetest/makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=typetest
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/validate/makefile.sc b/samples/validate/makefile.sc
index 28d2868b20e3b4fd4a4a672648b4def4cc579daf..d64f342ed157e363b2b92c2bc62676be56299eab 100644 (file)
--- a/samples/validate/makefile.sc
+++ b/samples/validate/makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=validate
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/widgets/Makefile.sc b/samples/widgets/Makefile.sc
index 979d862423805a4e4970065e23abd91a2a00a867..f53a99e348124a47d8ccb4291f8722a45ac72e61 100644 (file)
--- a/samples/widgets/Makefile.sc
+++ b/samples/widgets/Makefile.sc
@@ -1,6 +1,7 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=widgets
-OBJECTS = $(TARGET).obj 
+OBJECTS = $(TARGET).obj button.obj combobox.obj gauge.obj listbox.obj\
+ notebook.obj radiobox.obj slider.obj spinbtn.obj static.obj textctrl.obj
 EXTRALIBS =
 include $(WXDIR)\src\makeprog.sc

diff --git a/samples/wizard/makefile.sc b/samples/wizard/makefile.sc
index 2a81cda914b182c844c5813f783d347fab5a3c73..11ec6ae81f6c5ff689e08283868be71052651357 100644 (file)
--- a/samples/wizard/makefile.sc
+++ b/samples/wizard/makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=wizard
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =

diff --git a/samples/wxtest/Makefile.sc b/samples/wxtest/Makefile.sc
index 6bed9cca2fdc5a8e02afe72c569d542677bbcbfb..b867b31821a777150ff73fe649894041747dabf8 100644 (file)
--- a/samples/wxtest/Makefile.sc
+++ b/samples/wxtest/Makefile.sc
@@ -1,6 +1,6 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=test
-OBJECTS = $(TARGET).obj 
+OBJECTS = $(TARGET).obj test_wdr.obj
 EXTRALIBS =
 include $(WXDIR)\src\makeprog.sc