From: sparky4 <sparky4@cock.li>
Date: Sat, 12 Sep 2015 03:58:57 +0000 (-0500)
Subject: it compiled!!
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=f06d00600f804f121fe3a0b99ac85af4c5c75cbd;p=16.git

it compiled!!
	new file:   data/0.vgm
	modified:   exmmtest.map
	modified:   makefile
	modified:   scroll.map
	modified:   src/lib/vgmsnd/3812intf.c
	modified:   src/lib/vgmsnd/vgmSnd.h
	modified:   src/vgmtest.c
	new file:   vgmtest.exe
---

diff --git a/data/0.vgm b/data/0.vgm
new file mode 100755
index 00000000..fb4ee0cc
Binary files /dev/null and b/data/0.vgm differ
diff --git a/exmmtest.map b/exmmtest.map
index c45532d9..a403d194 100755
--- a/exmmtest.map
+++ b/exmmtest.map
@@ -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 15:04:17
+Created on:       15/09/11 22:58:16
 Executable Image: exmmtest.exe
 creating a DOS executable
 
diff --git a/makefile b/makefile
index 213d0e69..4d6056e4 100755
--- a/makefile
+++ b/makefile
@@ -35,11 +35,11 @@ FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS)
 
 DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ)
 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)
+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) 16_snd.$(OBJ)
+#3812intf.$(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
-#++++vgmtest.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)
 
@@ -281,6 +281,9 @@ emm.$(OBJ): $(DOSLIB)emm.h $(DOSLIB)emm.c
 16_hc.$(OBJ): $(SRCLIB)16_hc.h $(SRCLIB)16_hc.c
 	wcl $(FLAGS) -c $(SRCLIB)16_hc.c
 
+16_snd.$(OBJ): $(SRCLIB)16_snd.h $(SRCLIB)16_snd.c
+	wcl $(FLAGS) -c $(SRCLIB)16_snd.c
+
 jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c
 	wcl $(FLAGS) -c $(JSMNLIB)jsmn.c
 
@@ -290,6 +293,9 @@ kitten.$(OBJ): $(NYANLIB)kitten.h $(NYANLIB)kitten.c
 vgmSnd.$(OBJ): $(VGMSNDLIB)vgmSnd.h $(VGMSNDLIB)vgmSnd.c
 	wcl $(FLAGS) -c $(VGMSNDLIB)vgmSnd.c
 
+#3812intf.$(OBJ): $(VGMSNDLIB)3812intf.h $(VGMSNDLIB)3812intf.c
+#	wcl $(FLAGS) -c $(VGMSNDLIB)3812intf.c
+
 #farjsmn.$(OBJ): $(JSMNLIB)farjsmn.h $(JSMNLIB)farjsmn.c
 #	wcl $(FLAGS) $(MFLAGS) -c $(JSMNLIB)farjsmn.c
 
diff --git a/scroll.map b/scroll.map
index a8ad6aa0..3dbe0c43 100755
--- a/scroll.map
+++ b/scroll.map
@@ -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 15:04:18
+Created on:       15/09/11 22:58:16
 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.02
+Link time: 00:00.01
diff --git a/src/lib/vgmsnd/3812intf.c b/src/lib/vgmsnd/3812intf.c
index 876bb573..7ebb8ef2 100755
--- a/src/lib/vgmsnd/3812intf.c
+++ b/src/lib/vgmsnd/3812intf.c
@@ -17,9 +17,9 @@
 *
 ******************************************************************************/
 #include <stddef.h>
-#include "mamedef.h"
-#include "3812intf.h"
-#include "fmopl.h"
+//#include "src/lib/vgmsnd/mamedef.h"
+#include "src/lib/vgmsnd/3812intf.h"
+//#include "fmopl.h"
 
 
 typedef struct _ym3812_state ym3812_state;
@@ -53,10 +53,10 @@ int device_start_ym3812(UINT8 ChipID, int clock)
 {
 	ym3812_state *info;
 	int rate;
-	
+
 	if (ChipID >= MAX_CHIPS)
 		return 0;
-	
+
 	info = &YM3812Data[ChipID];
 	//rate = clock /72;
 	rate = CHIP_SAMPLE_RATE;
diff --git a/src/lib/vgmsnd/vgmSnd.h b/src/lib/vgmsnd/vgmSnd.h
index 9fa78f64..0a886bc8 100755
--- a/src/lib/vgmsnd/vgmSnd.h
+++ b/src/lib/vgmsnd/vgmSnd.h
@@ -73,8 +73,8 @@ void UpdateSoundEngine(void);
 
 
 // Functions that must be supplied by external library:
-//extern void OPL2_Write(UINT8 reg, UINT8 data);
-//extern UINT8 OPL2_ReadStatus(void);
+extern void OPL2_Write(UINT8 reg, UINT8 data);
+extern UINT8 OPL2_ReadStatus(void);
 
 
 #ifdef __cplusplus
diff --git a/src/vgmtest.c b/src/vgmtest.c
index 6ba057e8..03e0ec1e 100755
--- a/src/vgmtest.c
+++ b/src/vgmtest.c
@@ -24,16 +24,44 @@
  */
 
 #include "src/lib/vgmsnd/vgmSnd.h"
-#include "src/lib/vgmsnd/3812intf.h"
+#include "src/lib/16_snd.h"
+#include "src/lib/16_in.h"
 
-//#define VGM_SLOTS	4
+void OPL2_Write(UINT8 reg, UINT8 data);
+UINT8 OPL2_ReadStatus(void);
 
-//VGM_FILE vgmFiles[VGM_SLOTS];
+void OPL2_Write(UINT8 reg, UINT8 data)
+{
+	//ym3812_w(0, 0, reg);
+	//ym3812_w(0, 1, data);
+	opl2out(reg, data);
+	return;
+}
+
+UINT8 OPL2_ReadStatus(void)
+{
+	return 0;
+	//return ym3812_r(0, 0);
+}
 
-void main()
+void
+main(int argc, char *argv[])
 {
 	global_game_variables_t gvar;
+	VGM_FILE pee;
+	player_t player[MaxPlayers];
+
 	InitEngine();
+	OpenVGMFile("data\0.vgm", &pee);
+	IN_Startup();
+	IN_Default(0,&player,ctrl_Joystick);
+	PlayMusic(&pee);
+	while(!IN_KeyDown(sc_Escape))
+	{
+		IN_ReadControl(0,&player);
+		UpdateSoundEngine();
+	}
+	StopMusic();
 	/*VGM_FILE* tempVgmFile;
 	UINT8 vgmChn;
 	UINT8 vgmId;
@@ -44,5 +72,7 @@ void main()
 		PlayMusic(tempVgmFile);
 	else
 		PlaySFX(tempVgmFile, vgmChn);*/
+	FreeVGMFile(&pee);
 	DeinitEngine();
+	IN_Shutdown();
 }
diff --git a/vgmtest.exe b/vgmtest.exe
new file mode 100755
index 00000000..748dcc55
Binary files /dev/null and b/vgmtest.exe differ