testing vgmtest.exe on compy4 soon

diff --git a/src/lib/vgmsnd/vgmSnd.h b/src/lib/vgmsnd/vgmSnd.h
index da9fcec90e49c590420f326463b70863466173f9..a5515ad0c956a07f5212ba29a3611537d564be1b 100755 (executable)
--- a/src/lib/vgmsnd/vgmSnd.h
+++ b/src/lib/vgmsnd/vgmSnd.h
@@ -1,7 +1,7 @@
 #ifndef __VGMSNDDRV_H__\r
 #define __VGMSNDDRV_H__\r
 \r
-//#define VGM_USESCAMMPM\r
+#define VGM_USESCAMMPM\r
 \r
 #ifdef __cplusplus\r
 extern "C"\r

diff --git a/src/vgmtest.c b/src/vgmtest.c
index 6a53d65b587243033c6e9cd3acbb979f31c3a8ba..7d13975a7a77912f8e899a16a3ebdf265de4f318 100755 (executable)
--- a/src/vgmtest.c
+++ b/src/vgmtest.c
@@ -55,13 +55,14 @@ main(int argc, char *argv[])
 {\r
        static global_game_variables_t gvar;\r
        VGM_FILE pee[9];\r
-       char bakapee[64] = "data/adlib.vgm";\r
+       char bakapee[64] = "data/02.vgm";\r
 \r
        if(argv[1]) strcpy(bakapee, argv[1]);\r
 \r
-       MM_Startup(&gvar);\r
+//     MM_Startup(&gvar);\r
 //     PM_Startup(&gvar); PM_UnlockMainMem(&gvar);\r
 //     CA_Startup(&gvar);\r
+       StartupCAMMPM(&gvar);\r
        printf("%x\n", OpenVGMFile(bakapee, &pee[0], &gvar));\r
        InitEngine();\r
        PlayMusic(&pee[0]);\r
@@ -74,5 +75,6 @@ main(int argc, char *argv[])
        DeinitEngine();\r
 //     PM_Shutdown(&gvar);\r
 //     CA_Shutdown(&gvar);\r
-       MM_Shutdown(&gvar);\r
+//     MM_Shutdown(&gvar);\r
+       ShutdownCAMMPM(&gvar);\r
 }\r