Add initial support for MusyX

mupen64plus · Dec 30, 2013 · d31b8ea · d31b8ea
1 parent a2a06db
commit d31b8ea
Show file tree

Hide file tree

Showing 6 changed files with 810 additions and 3 deletions.
diff --git a/projects/msvc11/mupen64plus-rsp-hle.vcxproj b/projects/msvc11/mupen64plus-rsp-hle.vcxproj
@@ -96,6 +96,7 @@
     <ClCompile Include="..\..\src\cicx105.c" />
     <ClCompile Include="..\..\src\jpeg.c" />
     <ClCompile Include="..\..\src\main.c" />
+    <ClCompile Include="..\..\src\musyx.c" />
     <ClCompile Include="..\..\src\ucode1.cpp" />
     <ClCompile Include="..\..\src\ucode2.cpp" />
     <ClCompile Include="..\..\src\ucode3.cpp" />
@@ -107,8 +108,9 @@
     <ClInclude Include="..\..\src\cicx105.h" />
     <ClInclude Include="..\..\src\hle.h" />
     <ClInclude Include="..\..\src\jpeg.h" />
+    <ClInclude Include="..\..\src\musyx.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/projects/msvc8/mupen64plus-rsp-hle.vcproj b/projects/msvc8/mupen64plus-rsp-hle.vcproj
@@ -194,6 +194,10 @@
 				RelativePath="..\..\src\main.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\musyx.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\ucode1.cpp"
 				>
@@ -236,6 +240,10 @@
 				RelativePath="..\..\src\jpeg.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\musyx.h"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>

diff --git a/projects/unix/Makefile b/projects/unix/Makefile
@@ -234,6 +234,7 @@ SOURCE = \
 	$(SRCDIR)/alist.c \
 	$(SRCDIR)/cicx105.c \
 	$(SRCDIR)/jpeg.c \
+	$(SRCDIR)/musyx.c \
 	$(SRCDIR)/ucode3.cpp \
 	$(SRCDIR)/ucode2.cpp \
 	$(SRCDIR)/ucode1.cpp \

diff --git a/src/main.c b/src/main.c
@@ -33,6 +33,7 @@
 #include "alist.h"
 #include "cicx105.h"
 #include "jpeg.h"
+#include "musyx.h"
 
 #define min(a,b) (((a) < (b)) ? (a) : (b))
 
@@ -155,8 +156,8 @@ static int try_fast_audio_dispatching()
              * GauntletLegend, Rush2049, IndianaJones, BattleForNaboo
              * TODO: implement ucode
              **/
-            DebugMessage(M64MSG_WARNING, "MusyX ucode not implemented.");
-            /* return 1; */
+            musyx_task();
+            return 1;
         } else {
             /**
              * Many games including: