From f22c3c98a082b8a2c3787cd02bdb4de8509f4a12 Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Fri, 20 Jun 2003 15:20:31 +0000 Subject: [PATCH] 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 --- samples/access/Makefile.sc | 2 +- samples/artprov/Makefile.sc | 2 +- samples/calendar/makefile.sc | 2 +- samples/caret/Makefile.sc | 2 +- samples/checklst/makefile.sc | 2 +- samples/config/Makefile.sc | 2 +- samples/controls/makefile.sc | 2 +- samples/db/makefile.sc | 2 +- samples/dialogs/makefile.sc | 2 +- samples/dialup/makefile.sc | 2 +- samples/dnd/makefile.sc | 2 +- samples/docview/makefile.sc | 2 +- samples/docvwmdi/makefile.sc | 2 +- samples/dragimag/makefile.sc | 2 +- samples/drawing/makefile.sc | 2 +- samples/dynamic/makefile.sc | 2 +- samples/erase/makefile.sc | 2 +- samples/event/makefile.sc | 2 +- samples/exec/makefile.sc | 2 +- samples/font/makefile.sc | 2 +- samples/grid/makefile.sc | 2 +- samples/help/makefile.sc | 2 +- samples/html/about/Makefile.sc | 2 +- samples/html/help/Makefile.sc | 2 +- samples/html/printing/Makefile.sc | 2 +- samples/html/test/makefile.sc | 2 +- samples/html/virtual/Makefile.sc | 2 +- samples/html/widget/Makefile.sc | 2 +- samples/html/zip/Makefile.sc | 2 +- samples/image/makefile.sc | 2 +- samples/internat/makefile.sc | 2 +- samples/ipc/client.sc | 2 +- samples/ipc/server.sc | 2 +- samples/joytest/makefile.sc | 2 +- samples/keyboard/makefile.sc | 2 +- samples/layout/makefile.sc | 2 +- samples/listctrl/makefile.sc | 2 +- samples/menu/makefile.sc | 2 +- samples/minifram/makefile.sc | 2 +- samples/nativdlg/makefile.sc | 2 +- samples/notebook/makefile.sc | 2 +- samples/oleauto/makefile.sc | 2 +- samples/ownerdrw/makefile.sc | 2 +- samples/png/Makefile.sc | 2 +- samples/printing/makefile.sc | 2 +- samples/propsize/makefile.sc | 2 +- samples/regtest/makefile.sc | 2 +- samples/richedit/makefile.sc | 2 +- samples/rotate/makefile.sc | 2 +- samples/sashtest/makefile.sc | 2 +- samples/scroll/makefile.sc | 2 +- samples/scrollsub/makefile.sc | 2 +- samples/shaped/makefile.sc | 2 +- samples/sockets/client.sc | 2 +- samples/sockets/makefile.sc | 10 ++++++--- samples/sockets/server.sc | 2 +- samples/splitter/makefile.sc | 2 +- samples/statbar/makefile.sc | 2 +- samples/taskbar/makefile.sc | 2 +- samples/text/Makefile.sc | 2 +- samples/thread/makefile.sc | 36 ++++--------------------------- samples/toolbar/makefile.sc | 2 +- samples/treectrl/makefile.sc | 2 +- samples/typetest/makefile.sc | 2 +- samples/validate/makefile.sc | 2 +- samples/widgets/Makefile.sc | 5 +++-- samples/wizard/makefile.sc | 2 +- samples/wxtest/Makefile.sc | 4 ++-- 68 files changed, 80 insertions(+), 103 deletions(-) diff --git a/samples/access/Makefile.sc b/samples/access/Makefile.sc index cf68c4ef93..d4c38911c4 100644 --- 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 926f07622b..928f493486 100644 --- 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 8d8dcdfabe..fb1180676a 100644 --- 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 835230e114..536ddadb6f 100644 --- 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 210074b44e..319c5cd35e 100644 --- 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 947f5cda28..4c14a167ee 100644 --- 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 d3bd5732e4..7623577efc 100644 --- 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 8945a67c74..7ad74634a6 100644 --- 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 96e44a6ae4..d8dd828609 100644 --- 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 290d82addd..ed6a3c3054 100644 --- 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 edde5c7c07..9c4baf90ad 100644 --- 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 d28750908c..8ce6b49d53 100644 --- 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 9eff0f89c0..5b89e188f2 100644 --- 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 1cf04cc480..de64a90839 100644 --- 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 e36be3cbf1..c009cae882 100644 --- 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 4121cbbb83..56bec95d0e 100644 --- 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 9540426da0..72c1953e5a 100644 --- 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 a3aa39afec..450c1c3895 100644 --- 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 0276d80e44..04ebb1face 100644 --- 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 63e95e750f..fea69b76b2 100644 --- 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 56c4195745..a2562850c9 100644 --- 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 eb1323c243..fecaba3732 100644 --- 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 43325cdd80..56cb9a5215 100644 --- 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 362bea839a..c6a9340e08 100644 --- 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 cbeee7003f..e415fd2f28 100644 --- 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 1c9ffc2d90..894f9fd9f3 100644 --- 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 c01f4f3efc..2010b7d422 100644 --- 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 89e46e2824..50e13bfc24 100644 --- 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 e677f99e15..98dcb9e798 100644 --- 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 91c323c522..6460f2130b 100644 --- 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 a2e6f62534..516a0b574d 100644 --- 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 19aa06f3d0..b69e49e3d1 100644 --- 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 f43b26fd1f..c46ba1a349 100644 --- 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 32df4f5503..bcacd48b3a 100644 --- 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 dd90d58793..227437be27 100644 --- 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 3dc8b4f7c7..6e67c4ad94 100644 --- 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 f9798e8489..2335fe68dd 100644 --- 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 45d818c505..44cd1ae98e 100644 --- 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 3efa80cd3c..c2a8fcbe3c 100644 --- 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 8458e846f9..1bee812f82 100644 --- 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 20174a385b..64584b5005 100644 --- 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 bda02c2d7f..9dcf639543 100644 --- 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 b18de3fa44..62c31c877d 100644 --- 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 d8df92e36b..1bac49df28 100644 --- 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 5b1c6db309..6119daafd6 100644 --- 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 dccdd8edd4..a6a28d7a58 100644 --- 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 b1de45d913..202b0caf7e 100644 --- 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 a913070215..37bc3e9f76 100644 --- 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 73b688953a..9e189a3e12 100644 --- 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 21817b034f..12578da19d 100644 --- 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 c7225c030a..97673ff075 100644 --- 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 bd5a3490ef..0f75a6920d 100644 --- 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 682c546679..d40079553d 100644 --- 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 02eca76983..4ada6e8ca2 100644 --- 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 38b713e7a3..9a43c3bcb3 100644 --- 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 253983dbd5..faff57b3ce 100644 --- 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 b867be6c5e..4b5b66b06f 100644 --- 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 b52e936902..0f0374c7c0 100644 --- 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 5eb654b8dc..65d7e96908 100644 --- 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 dac57b1a75..d0c3b33109 100644 --- 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 58539802e0..839478d57d 100644 --- 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 8c8d2eb55c..4a1c7b4811 100644 --- 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 350df570f7..a19cdce13d 100644 --- 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 0e7de742ad..6f782f2e46 100644 --- 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 28d2868b20..d64f342ed1 100644 --- 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 979d862423..f53a99e348 100644 --- 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 2a81cda914..11ec6ae81f 100644 --- 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 6bed9cca2f..b867b31821 100644 --- 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