ok

	modified:   16.maw
	modified:   bakapi.maw
	modified:   exmmtest.maw
	modified:   fmemtest.maw
	modified:   fontgfx.maw
	modified:   inputest.maw
	modified:   makefile
	modified:   maptest.maw
	modified:   palettec.maw
	modified:   scroll.maw
	modified:   src/lib/vgmsnd/common.h
	modified:   src/lib/vgmsnd/vgmSnd.h
	modified:   tsthimem.maw

diff --git a/16.maw b/16.maw
index 9d490719fc5161e9a48aec06113215313f2d0af4..ef41effe8924a57be580d33551baab56d5a23457 100755 (executable)
--- a/16.maw
+++ b/16.maw
@@ -1,6 +1,6 @@
 Open Watcom Linker Version 1.9
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/09/11 12:56:32
+Created on:       15/09/11 13:50:36
 Executable Image: 16.exe
 creating a DOS executable
 
@@ -479,4 +479,4 @@ Module: /usr/watcom/lib286/dos/clibc.lib(mbinit.c)
 Stack size:  8000 (32768.)
 Memory size:  00011b00 (72448.)
 Entry point address: 0000:3674
-Link time: 00:00.09
+Link time: 00:00.11

diff --git a/bakapi.maw b/bakapi.maw
index 538adfebd1afb9c4dbf4b85774043664ae87069e..7ef82584ad8a72e3e46418b84abe80fba887cce4 100755 (executable)
--- a/bakapi.maw
+++ b/bakapi.maw
@@ -1,6 +1,6 @@
 Open Watcom Linker Version 1.9
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/09/11 12:56:32
+Created on:       15/09/11 13:50:36
 Executable Image: bakapi.exe
 creating a DOS executable
 
@@ -447,4 +447,4 @@ Module: /usr/watcom/lib286/dos/clibc.lib(bexpand.c)
 Stack size:  8000 (32768.)
 Memory size:  000108e0 (67808.)
 Entry point address: 0000:21b0
-Link time: 00:00.00
+Link time: 00:00.01

diff --git a/exmmtest.maw b/exmmtest.maw
index 123b14eb7ba62cb4eb57ae3d6e711dca4b746c1f..e0e3da75f20c41b48e433f60abb2fe438fe7538d 100755 (executable)
--- a/exmmtest.maw
+++ b/exmmtest.maw
@@ -1,6 +1,6 @@
 Open Watcom Linker Version 1.9
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/09/11 12:56:32
+Created on:       15/09/11 13:50:36
 Executable Image: exmmtest.exe
 creating a DOS executable
 

diff --git a/fmemtest.maw b/fmemtest.maw
index 59c1c727694635effb741e42fb31cea50eac2e4a..cacc28c1601af76ff02efd9edf0da8b430c83717 100755 (executable)
--- a/fmemtest.maw
+++ b/fmemtest.maw
@@ -1,6 +1,6 @@
 Open Watcom Linker Version 1.9
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/09/11 12:56:33
+Created on:       15/09/11 13:50:36
 Executable Image: fmemtest.exe
 creating a DOS executable
 
@@ -297,4 +297,4 @@ Module: /usr/watcom/lib286/dos/clibc.lib(doserror)
 Stack size:  8000 (32768.)
 Memory size:  b210 (45584.)
 Entry point address: 0000:03aa
-Link time: 00:00.01
+Link time: 00:00.00

diff --git a/fontgfx.maw b/fontgfx.maw
index fa5783464964b9e4147d9e4d6462e4d63dd59ffd..181aafb377adf54f357a708722297d9ea9924c12 100755 (executable)
--- a/fontgfx.maw
+++ b/fontgfx.maw
@@ -1,6 +1,6 @@
 Open Watcom Linker Version 1.9
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/09/11 12:56:33
+Created on:       15/09/11 13:50:36
 Executable Image: fontgfx.exe
 creating a DOS executable
 

diff --git a/inputest.maw b/inputest.maw
index 4cfcd7b053a512f97425c4d3b4407e5157dae2d6..2b2e65945cdfa2630e3bec5f15f91c61baba9b55 100755 (executable)
--- a/inputest.maw
+++ b/inputest.maw
@@ -1,6 +1,6 @@
 Open Watcom Linker Version 1.9
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/09/11 12:56:33
+Created on:       15/09/11 13:50:36
 Executable Image: inputest.exe
 creating a DOS executable
 
@@ -381,4 +381,4 @@ Module: /usr/watcom/lib286/dos/clibc.lib(bexpand.c)
 Stack size:  8000 (32768.)
 Memory size:  d820 (55328.)
 Entry point address: 0000:1108
-Link time: 00:00.02
+Link time: 00:00.01

diff --git a/makefile b/makefile
index 59abcd6323f05f8c2ac27cec24b84f20524909a0..85dedb5a7620a43d3cf0e255df505d730fc02db8 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -38,7 +38,8 @@ DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 16LIBOBJS = bakapee.$(OBJ) 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) scroll16.$(OBJ) 16_ca.$(OBJ) timer.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) vgmSnd.$(OBJ)
 GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ)
 
-TESTEXEC =  exmmtest.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe tsthimem.exe inputest.exe scroll.exe vgmsnd.exe
+TESTEXEC =  exmmtest.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe tsthimem.exe inputest.exe scroll.exe
+#++++vgmtest.exe
 #testemm.exe testemm0.exe fonttes0.exe miditest.exe sega.exe sountest.exe
 EXEC = 16.exe bakapi.exe $(TESTEXEC)
 

diff --git a/maptest.maw b/maptest.maw
index 196a3a45eed24f0792648e9b4b4e46712a882f4c..12be8f0a014d3634d195209556afe6573c5f1198 100755 (executable)
--- a/maptest.maw
+++ b/maptest.maw
@@ -1,6 +1,6 @@
 Open Watcom Linker Version 1.9
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/09/11 12:56:33
+Created on:       15/09/11 13:50:36
 Executable Image: maptest.exe
 creating a DOS executable
 

diff --git a/palettec.maw b/palettec.maw
index 7b68b04bca2cb7feed851c168d56e4d877a634cd..bdbbc1d9d52d2ceb723afb228423eff9b7307914 100755 (executable)
--- a/palettec.maw
+++ b/palettec.maw
@@ -1,6 +1,6 @@
 Open Watcom Linker Version 1.9
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/09/11 12:56:33
+Created on:       15/09/11 13:50:36
 Executable Image: palettec.exe
 creating a DOS executable
 
@@ -395,4 +395,4 @@ Module: /usr/watcom/lib286/dos/clibc.lib(bexpand.c)
 Stack size:  8000 (32768.)
 Memory size:  e570 (58736.)
 Entry point address: 0000:17da
-Link time: 00:00.00
+Link time: 00:00.01

diff --git a/scroll.maw b/scroll.maw
index f56d933306eb25dc5728ff85c16d74e70076535f..376e12460bc41f6c46f39e65b417cb5cdf9ef325 100755 (executable)
--- a/scroll.maw
+++ b/scroll.maw
@@ -1,6 +1,6 @@
 Open Watcom Linker Version 1.9
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/09/11 12:56:33
+Created on:       15/09/11 13:50:36
 Executable Image: scroll.exe
 creating a DOS executable
 
@@ -600,4 +600,4 @@ Module: /usr/watcom/lib286/dos/clibc.lib(hugeval.c)
 Stack size:  8000 (32768.)
 Memory size:  000164b0 (91312.)
 Entry point address: 0000:5fe4
-Link time: 00:00.01
+Link time: 00:00.02

diff --git a/src/lib/vgmsnd/common.h b/src/lib/vgmsnd/common.h
index dabc1f0290b121c44e096ea215791390b5c01838..a25a046dfe1085b61a56496b1d1360ac8a0326d0 100755 (executable)
--- a/src/lib/vgmsnd/common.h
+++ b/src/lib/vgmsnd/common.h
@@ -2,7 +2,7 @@
 #define __COMMON_H__
 
 #include "src/lib/vgmsnd/stdtype.h"
-#include "src/lib/16_head.h"
+//#include "src/lib/16_head.h"
 //#include "src/lib/vgmsnd/stdbool.h"
 
 #ifndef INLINE

diff --git a/src/lib/vgmsnd/vgmSnd.h b/src/lib/vgmsnd/vgmSnd.h
index a519bc4b6ca17422c45f4f8651b6af175048db91..9fa78f64bec4d34fe18af435d81e2dd68a313642 100755 (executable)
--- a/src/lib/vgmsnd/vgmSnd.h
+++ b/src/lib/vgmsnd/vgmSnd.h
@@ -7,6 +7,7 @@ extern "C"
 #endif\r
 \r
 #include "src/lib/vgmsnd/stdtype.h"\r
+#include "src/lib/16_head.h"\r
 \r
 typedef struct _vgm_file_header\r
 {\r

diff --git a/tsthimem.maw b/tsthimem.maw
index 3ee7d1c5074d766cd62bf454d248a992fb751302..f9db65822feebd7a0f76f6ecca8a55da151bbe1a 100755 (executable)
--- a/tsthimem.maw
+++ b/tsthimem.maw
@@ -1,6 +1,6 @@
 Open Watcom Linker Version 1.9
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/09/11 12:56:33
+Created on:       15/09/11 13:50:36
 Executable Image: tsthimem.exe
 creating a DOS executable
 
@@ -384,4 +384,4 @@ Module: /usr/watcom/lib286/dos/clibc.lib(doserror)
 Stack size:  8000 (32768.)
 Memory size:  d0b0 (53424.)
 Entry point address: 0000:168e
-Link time: 00:00.01
+Link time: 00:00.02