From: sparky4 Date: Fri, 11 Sep 2015 18:51:55 +0000 (-0500) Subject: ok X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=9f7e47a319a67b514c08ef13237454de0217d94e;p=16.git 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 9d490719..ef41effe 100755 --- 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 538adfeb..7ef82584 100755 --- 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 123b14eb..e0e3da75 100755 --- 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 59c1c727..cacc28c1 100755 --- 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 fa578346..181aafb3 100755 --- 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 4cfcd7b0..2b2e6594 100755 --- 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 59abcd63..85dedb5a 100755 --- 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 196a3a45..12be8f0a 100755 --- 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 7b68b04b..bdbbc1d9 100755 --- 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 f56d9333..376e1246 100755 --- 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 dabc1f02..a25a046d 100755 --- 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 a519bc4b..9fa78f64 100755 --- a/src/lib/vgmsnd/vgmSnd.h +++ b/src/lib/vgmsnd/vgmSnd.h @@ -7,6 +7,7 @@ extern "C" #endif #include "src/lib/vgmsnd/stdtype.h" +#include "src/lib/16_head.h" typedef struct _vgm_file_header { diff --git a/tsthimem.maw b/tsthimem.maw index 3ee7d1c5..f9db6582 100755 --- 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