fix SF bug report 751351

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

diff --git a/samples/artprov/makefile.wat b/samples/artprov/makefile.wat
index f1d21846fb333f93d74cc88f5bc68145f208b3fa..bfd496b80bbdfd72aa2e54f54223deded2578b7e 100644 (file)
--- a/samples/artprov/makefile.wat
+++ b/samples/artprov/makefile.wat
@@ -6,7 +6,7 @@
 # 
 # 
 # 
-PROGRAM = artprov 
-OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+PROGRAM = arttest 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj $(OUTPUTDIR)\artbrows.obj
 # 
 !include $(%WXWIN)\src\makeprog.wat 

diff --git a/samples/config/makefile.wat b/samples/config/makefile.wat
index aa5a99960b0f0826a392a44b081c8c625808e097..c40ba2d2fceb7b509db00600f93516c7ca3703a4 100644 (file)
--- a/samples/config/makefile.wat
+++ b/samples/config/makefile.wat
@@ -6,7 +6,7 @@
 # 
 # 
 # 
-PROGRAM = config 
+PROGRAM = conftest 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
 # 
 !include $(%WXWIN)\src\makeprog.wat 

diff --git a/samples/db/makefile.wat b/samples/db/makefile.wat
index 361a80c00df2c0482a281b0f15848c1eaef424a1..264ff584d0ed35fee266f0c30741b60796a04815 100644 (file)
--- a/samples/db/makefile.wat
+++ b/samples/db/makefile.wat
@@ -6,7 +6,7 @@
 # 
 # 
 # 
-PROGRAM = db 
-OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+PROGRAM = PROGRAM=dbtest
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj $(OUTPUTDIR)\listdb.obj 
 # 
 !include $(%WXWIN)\src\makeprog.wat 

diff --git a/samples/dialup/makefile.wat b/samples/dialup/makefile.wat
new file mode 100644 (file)
index 0000000..ab8b0dc
--- /dev/null
+++ b/samples/dialup/makefile.wat
@@ -0,0 +1,12 @@
+# 
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = nettest 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

diff --git a/samples/docview/makefile.wat b/samples/docview/makefile.wat
index 03444dab1d502d5344260c900dcb4fd1b3911de1..a86da1fae210c3afd891188315264e4a08a81656 100644 (file)
--- a/samples/docview/makefile.wat
+++ b/samples/docview/makefile.wat
@@ -7,6 +7,6 @@
 # 
 # 
 PROGRAM = docview 
-OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj $(OUTPUTDIR)\doc.obj $(OUTPUTDIR)\view.obj 
 # 
 !include $(%WXWIN)\src\makeprog.wat 

diff --git a/samples/docvwmdi/makefile.wat b/samples/docvwmdi/makefile.wat
index e06970673e8f78dc17178e0cae7a560ba9b5a758..e30172aea60f41502fcf30283903bbc7bd856dd7 100644 (file)
--- a/samples/docvwmdi/makefile.wat
+++ b/samples/docvwmdi/makefile.wat
@@ -6,7 +6,7 @@
 # 
 # 
 # 
-PROGRAM = docvwmdi 
-OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+PROGRAM = docview
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj $(OUTPUTDIR)\doc.obj $(OUTPUTDIR)\view.obj 
 # 
 !include $(%WXWIN)\src\makeprog.wat 

diff --git a/samples/dynamic/makefile.wat b/samples/dynamic/makefile.wat
new file mode 100644 (file)
index 0000000..0da994f
--- /dev/null
+++ b/samples/dynamic/makefile.wat
@@ -0,0 +1,12 @@
+# 
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+PROGRAM = dynamic 
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
+# 
+!include $(%WXWIN)\src\makeprog.wat 

diff --git a/samples/help/makefile.wat b/samples/help/makefile.wat
index 819ece54241f69c189603ccae090c2cf459cec37..1863cda4a26652f327c8041dc2632f30394b5fde 100644 (file)
--- a/samples/help/makefile.wat
+++ b/samples/help/makefile.wat
@@ -6,7 +6,7 @@
 # 
 # 
 # 
-PROGRAM = help 
+PROGRAM = demo 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
 # 
 !include $(%WXWIN)\src\makeprog.wat 

diff --git a/samples/html/makefile.wat b/samples/html/makefile.wat
new file mode 100644 (file)
index 0000000..f152f07
--- /dev/null
+++ b/samples/html/makefile.wat
@@ -0,0 +1,56 @@
+#
+# File:                makefile.wat
+# Author:      Julian Smart
+# Created:     1993
+# Updated:     
+# Copyright:   (c) 1993, AIAI, University of Edinburgh
+#
+# "%W% %G%"
+#
+# Makefile : Builds samples for windows with Watcom
+# Use FINAL=1 argument to wmake to build final version with no debugging
+# info
+
+# Set WXDIR for your system
+WXDIR = $(%WXWIN)
+
+THISDIR=$(WXDIR)\samples\html
+
+!include $(WXDIR)\src\makewat.env
+
+all:
+        cd $(WXDIR)\samples\html\about
+        wmake -f makefile.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\html\help
+        wmake -f makefile.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\html\helpview
+        wmake -f makefile.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\html\printing
+        wmake -f makefile.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\html\test
+        wmake -f makefile.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\html\virtual
+        wmake -f makefile.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\html\widget
+        wmake -f makefile.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\html\zip
+        wmake -f makefile.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+
+clean:
+        cd $(WXDIR)\samples\html\about
+        wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\html\help
+        wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\html\helpview
+        wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\html\printing
+        wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\html\test
+        wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\html\virtual
+        wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\html\widget
+        wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\html\zip
+        wmake -f makefile.wat clean
+

diff --git a/samples/ipc/makefile.wat b/samples/ipc/makefile.wat
new file mode 100644 (file)
index 0000000..e70d346
--- /dev/null
+++ b/samples/ipc/makefile.wat
@@ -0,0 +1,17 @@
+# 
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+!include $(%WXWIN)\src\makewat.env
+
+all:
+    wmake -f server.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+    wmake -f client.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+
+clean:
+    wmake -f server.wat clean
+    wmake -f client.wat clean
\ No newline at end of file

diff --git a/samples/makefile.wat b/samples/makefile.wat
new file mode 100644 (file)
index 0000000..b9e47bc
--- /dev/null
+++ b/samples/makefile.wat
@@ -0,0 +1,278 @@
+#
+# File:                makefile.wat
+# Author:      Julian Smart
+# Created:     1993
+# Updated:     
+# Copyright:   (c) 1993, AIAI, University of Edinburgh
+#
+# "%W% %G%"
+#
+# Makefile : Builds samples for windows with Watcom
+# Use FINAL=1 argument to wmake to build final version with no debugging
+# info
+
+# Set WXDIR for your system
+WXDIR=$(%WXWIN)
+
+THISDIR=$(WXDIR)\samples
+
+!include $(WXDIR)\src\makewat.env
+
+MAKEFLAGS=FINAL=$(FINAL) UNICODE=$(UNICODE) WXUSINGDLL=$(WXUSINGDLL)
+
+#
+# Please keep samples list up-to-date, in alphabetical order
+#
+all:
+        cd $(WXDIR)\samples\artprov
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\calendar
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\caret
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\checklst
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\config
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\controls
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\db
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\dialogs
+        -wmake -f makefile.wat $(MAKEFLAGS)
+!if "$(COMPIL)"==""
+        cd $(WXDIR)\samples\dialup
+        -wmake -f makefile.wat $(MAKEFLAGS)
+!endif
+        cd $(WXDIR)\samples\dnd
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\docview
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\docvwmdi
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\dragimag
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\drawing
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\dynamic
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\erase
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\event
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\font
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\grid
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\help
+        -wmake -f makefile.wat $(MAKEFLAGS)
+!if "$(PNGSETUP)"==""
+        cd $(WXDIR)\samples\html
+        -wmake -f makefile.wat $(MAKEFLAGS)
+!endif
+        cd $(WXDIR)\samples\image
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\internat
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\ipc
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\joytest
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\keyboard
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\layout
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\listctrl
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\mdi
+        -wmake -f makefile.wat $(MAKEFLAGS)
+#!if "$(FINAL)" == "0"
+#        cd $(WXDIR)\samples\memcheck
+#        -wmake -f makefile.wat $(MAKEFLAGS)
+#!endif
+        cd $(WXDIR)\samples\menu
+        -wmake -f makefile.wat $(MAKEFLAGS)
+!if "$(COMPIL)"==""
+        cd $(WXDIR)\samples\mfc
+        -wmake -f makefile.wat $(MAKEFLAGS)
+!endif
+        cd $(WXDIR)\samples\minifram
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\minimal
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\nativdlg
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\newgrid
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\notebook
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\oleauto
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\ownerdrw
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\png
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\printing
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\proplist
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\propsize
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\regtest
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\resource
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\rotate
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\sashtest
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\scroll
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\scrollsub
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\sockets
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\splitter
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\statbar
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\taskbar
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\text
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\thread
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\toolbar
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\treectrl
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\typetest
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\validate
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\widgets
+        -wmake -f makefile.wat $(MAKEFLAGS)
+        cd $(WXDIR)\samples\wizard
+        -wmake -f makefile.wat $(MAKEFLAGS)
+
+clean:
+        cd $(WXDIR)\samples\calendar
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\caret
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\checklst
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\config
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\controls
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\db
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\dialogs
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\dialup
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\dnd
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\docview
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\docvwmdi
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\drawing
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\dragimag
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\dynamic
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\erase
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\event
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\font
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\grid
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\help
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\html
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\image
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\internat
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\ipc
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\joytest
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\keyboard
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\layout
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\listctrl
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\mdi
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\mfc
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\memcheck
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\menu
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\minifram
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\minimal
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\nativdlg
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\newgrid
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\notebook
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\oleauto
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\ownerdrw
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\png
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\printing
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\proplist
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\propsize
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\regtest
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\resource
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\rotate
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\sashtest
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\scroll
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\scrollsub
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\sockets
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\splitter
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\statbar
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\taskbar
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\text
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\thread
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\toolbar
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\treectrl
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\typetest
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\validate
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\widgets
+        -wmake -f makefile.wat clean
+        cd $(WXDIR)\samples\wizard
+        -wmake -f makefile.wat clean

diff --git a/samples/png/makefile.wat b/samples/png/makefile.wat
index f3e275e8ae87455c16d4582cfd8c24d4f50361ad..eb51d37467bdb9ec263a75f93143e3ee59b0161e 100644 (file)
--- a/samples/png/makefile.wat
+++ b/samples/png/makefile.wat
@@ -6,7 +6,7 @@
 # 
 # 
 # 
-PROGRAM = png 
+PROGRAM = pngdemo
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
 # 
 !include $(%WXWIN)\src\makeprog.wat 

diff --git a/samples/sockets/makefile.wat b/samples/sockets/makefile.wat
new file mode 100644 (file)
index 0000000..e70d346
--- /dev/null
+++ b/samples/sockets/makefile.wat
@@ -0,0 +1,17 @@
+# 
+# Makefile for WATCOM 
+# 
+# Created by Julian Smart, January 1999 
+#  
+# 
+# 
+# 
+!include $(%WXWIN)\src\makewat.env
+
+all:
+    wmake -f server.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+    wmake -f client.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+
+clean:
+    wmake -f server.wat clean
+    wmake -f client.wat clean
\ No newline at end of file

diff --git a/samples/taskbar/makefile.wat b/samples/taskbar/makefile.wat
index ed3028808349dd26ba21a8dd05f846349b32b874..88489d3dce6a9e2d97a114dda1c8a4d34b115281 100644 (file)
--- a/samples/taskbar/makefile.wat
+++ b/samples/taskbar/makefile.wat
@@ -6,7 +6,7 @@
 # 
 # 
 # 
-PROGRAM = taskbar 
+PROGRAM = tbtest 
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
 # 
 !include $(%WXWIN)\src\makeprog.wat