Merge http://github.com/project64/project64

Conflicts: Source/Project64/N64System/Debugger/Breakpoints.h Source/Project64/N64System/Debugger/Debugger-Commands.cpp Source/Project64/N64System/Debugger/Debugger-Commands.h Source/Project64/N64System/Debugger/Debugger-ViewMemory.cpp Source/Project64/N64System/Debugger/Debugger-ViewMemory.h Source/Project64/N64System/Debugger/Debugger.cpp Source/Project64/N64System/Debugger/OpInfo.h Source/Project64/N64System/Debugger/debugger.h Source/Project64/UserInterface/resource.h
shygoo · Sep 17, 2017 · 2e8cd80 · 2e8cd80
2 parents 3869fbc + 0e508eb
commit 2e8cd80
Show file tree

Hide file tree

Showing 76 changed files with 6,506 additions and 6,401 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,6 +34,8 @@ Thumbs.db
 /ipch
 /Plugin/Audio/AndroidAudio.dll
 /Plugin/Audio/AndroidAudio_d.dll
+/Plugin/Audio/Project64-Audio.dll
+/Plugin/Audio/Project64-Audio_d.dll
 /Plugin/GFX/lib
 /Plugin/GFX/map
 /Plugin/GFX/pdb
@@ -56,6 +58,8 @@ Thumbs.db
 /Plugin64/AndroidAudio
 /Plugin64/Audio/AndroidAudio.dll
 /Plugin64/Audio/AndroidAudio_d.dll
+/Plugin64/Audio/Project64-Audio.dll
+/Plugin64/Audio/Project64-Audio_d.dll
 /Plugin64/GFX/lib
 /Plugin64/GFX/map
 /Plugin64/GFX/pdb

diff --git a/Android/Script/copySource.cmd b/Android/Script/copySource.cmd
@@ -23,10 +23,6 @@ echo copy Common
 xcopy "%base_dir%/Source/Common" "%base_dir%/Android/jni/Common/" /D /I /F /Y /E
 IF %ERRORLEVEL% NEQ 0 (exit /B 1)
 
-echo copy PluginAudio
-xcopy "%base_dir%/Source/Android/PluginAudio" "%base_dir%/Android/jni/PluginAudio/" /D /I /F /Y /E
-IF %ERRORLEVEL% NEQ 0 (exit /B 1)
-
 echo copy PluginInput
 xcopy "%base_dir%/Source/Android/PluginInput" "%base_dir%/Android/jni/PluginInput/" /D /I /F /Y /E
 IF %ERRORLEVEL% NEQ 0 (exit /B 1)
@@ -39,6 +35,10 @@ echo copy Project64-bridge
 xcopy "%base_dir%/Source/Android/Bridge" "%base_dir%/Android/jni/Project64-bridge/" /D /I /F /Y /E
 IF %ERRORLEVEL% NEQ 0 (exit /B 1)
 
+echo copy Project64-audio
+xcopy "%base_dir%/Source/Project64-audio" "%base_dir%/Android/jni/Project64-audio/" /D /I /F /Y /E
+IF %ERRORLEVEL% NEQ 0 (exit /B 1)
+
 echo copy Project64-core
 xcopy "%base_dir%/Source/Project64-core" "%base_dir%/Android/jni/Project64-core/" /D /I /F /Y /E
 IF %ERRORLEVEL% NEQ 0 (exit /B 1)

diff --git a/Android/copySource.xml b/Android/copySource.xml
@@ -13,9 +13,6 @@
 		<copy todir="./jni/Common/">
 		    <fileset dir="../Source/Common"/>
 		</copy>
-		<copy todir="./jni/PluginAudio/">
-		    <fileset dir="../Source/Android/PluginAudio"/>
-		</copy>
 		<copy todir="./jni/PluginInput/">
 		    <fileset dir="../Source/Android/PluginInput"/>
 		</copy>
@@ -25,6 +22,9 @@
 		<copy todir="./jni/Project64-bridge/">
 		    <fileset dir="../Source/Android/Bridge"/>
 		</copy>
+		<copy todir="./jni/Project64-audio/">
+		    <fileset dir="../Source/Project64-audio"/>
+		</copy>
 		<copy todir="./jni/Project64-core/">
 		    <fileset dir="../Source/Project64-core"/>
 		</copy>

diff --git a/Android/jni/Android.mk b/Android/jni/Android.mk
@@ -21,9 +21,9 @@ COMMON_CPPFLAGS :=                  \
 include $(JNI_LOCAL_PATH)/3rdParty/png/png.mk
 include $(JNI_LOCAL_PATH)/3rdParty/zlib/zlib.mk
 include $(JNI_LOCAL_PATH)/Common/common.mk
-include $(JNI_LOCAL_PATH)/PluginAudio/PluginAudio.mk
 include $(JNI_LOCAL_PATH)/PluginInput/PluginInput.mk
 include $(JNI_LOCAL_PATH)/PluginRSP/PluginRSP.mk
+include $(JNI_LOCAL_PATH)/Project64-audio/Project64-audio.mk
 include $(JNI_LOCAL_PATH)/Project64-bridge/Project64-bridge.mk
 include $(JNI_LOCAL_PATH)/Project64-core/Project64-core.mk
 include $(JNI_LOCAL_PATH)/Project64-video/Project64-video.mk

diff --git a/Android/jni/PluginAudio/.gitignore → Android/jni/Project64-audio/.gitignore b/Android/jni/PluginAudio/.gitignore → Android/jni/Project64-audio/.gitignore
diff --git a/Android/jni/PluginAudio/PluginAudio.mk → ...id/jni/Project64-audio/Project64-audio.mk b/Android/jni/PluginAudio/PluginAudio.mk → ...id/jni/Project64-audio/Project64-audio.mk
@@ -3,7 +3,7 @@
 ######################
 include $(CLEAR_VARS)
 LOCAL_PATH := $(JNI_LOCAL_PATH)
-SRCDIR := ./PluginAudio
+SRCDIR := ./Project64-audio
 
 LOCAL_MODULE := Project64-audio-android
 LOCAL_STATIC_LIBRARIES := common \
@@ -13,10 +13,12 @@ LOCAL_ARM_MODE := arm
 
 LOCAL_C_INCLUDES :=
 
-LOCAL_SRC_FILES :=               \
-    $(SRCDIR)/AudioSettings.cpp  \
-    $(SRCDIR)/Main.cpp           \
-    $(SRCDIR)/trace.cpp          \
+LOCAL_SRC_FILES :=                 \
+    $(SRCDIR)/Driver/OpenSLES.cpp  \
+    $(SRCDIR)/Driver/SoundBase.cpp \
+    $(SRCDIR)/AudioMain.cpp        \
+    $(SRCDIR)/AudioSettings.cpp    \
+    $(SRCDIR)/trace.cpp            \
 
 LOCAL_CFLAGS := $(COMMON_CFLAGS)
 

diff --git a/Config/Project64.rdb b/Config/Project64.rdb
@@ -1453,7 +1453,6 @@ Counter Factor=1
 Culling=1
 RDRAM Size=8
 Save Type=16kbit Eeprom
-Cheat0=806128E2 0000 // Polygon Tearing Fix
 
 [053C89A7-A5064302-C:4A]
 Good Name=Donkey Kong 64 (J)
@@ -1464,7 +1463,6 @@ Plugin Note=[Glide64] fairy bug; transitions
 Counter Factor=1
 RDRAM Size=8
 Save Type=16kbit Eeprom
-Cheat0=806170A2 0000 // Polygon Tearing Fix
 
 [EC58EABF-AD7C7169-C:45]
 Good Name=Donkey Kong 64 (U)
@@ -1478,7 +1476,6 @@ Emulate Clear=1
 Primary Frame Buffer=1
 RDRAM Size=8
 Save Type=16kbit Eeprom
-Cheat0=80619632 0000 // Polygon Tearing Fix
 
 [0DD4ABAB-B5A2A91E-C:45]
 Good Name=Donkey Kong 64 (U) (Kiosk Demo)

diff --git a/Project64.sln b/Project64.sln
@@ -46,8 +46,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "Source\3rdParty\png\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Android", "Android", "{0E0FCAC2-E128-4886-8EE6-1BCA84551F58}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginAudio", "Source\Android\PluginAudio\PluginAudio.vcxproj", "{D233025A-231F-4A43-92B6-E87193C60ACC}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginInput", "Source\Android\PluginInput\PluginInput.vcxproj", "{1133A1CC-A9E5-4026-B20D-6A2987130D4E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginRSP", "Source\Android\PluginRSP\PluginRSP.vcxproj", "{B685BB34-D700-4FCC-8503-9B6AA1A0C95D}"
@@ -58,6 +56,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "duktape", "Source\3rdParty\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64-video", "Source\Project64-video\Project64-video.vcxproj", "{A4D13408-A794-4199-8FC7-4A9A32505005}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64-audio", "Source\Project64-audio\Project64-audio.vcxproj", "{D233025A-231F-4A43-92B6-E87193C60ACC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -151,12 +151,6 @@ Global
 		{17836496-31B0-46F2-B1B1-366D7DF6F04C}.Release|Win32.Build.0 = Release|Win32
 		{17836496-31B0-46F2-B1B1-366D7DF6F04C}.Release|x64.ActiveCfg = Release|x64
 		{17836496-31B0-46F2-B1B1-366D7DF6F04C}.Release|x64.Build.0 = Release|x64
-		{D233025A-231F-4A43-92B6-E87193C60ACC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D233025A-231F-4A43-92B6-E87193C60ACC}.Debug|Win32.Build.0 = Debug|Win32
-		{D233025A-231F-4A43-92B6-E87193C60ACC}.Debug|x64.ActiveCfg = Debug|Win32
-		{D233025A-231F-4A43-92B6-E87193C60ACC}.Release|Win32.ActiveCfg = Release|Win32
-		{D233025A-231F-4A43-92B6-E87193C60ACC}.Release|Win32.Build.0 = Release|Win32
-		{D233025A-231F-4A43-92B6-E87193C60ACC}.Release|x64.ActiveCfg = Release|Win32
 		{1133A1CC-A9E5-4026-B20D-6A2987130D4E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1133A1CC-A9E5-4026-B20D-6A2987130D4E}.Debug|Win32.Build.0 = Debug|Win32
 		{1133A1CC-A9E5-4026-B20D-6A2987130D4E}.Debug|x64.ActiveCfg = Debug|Win32
@@ -191,6 +185,12 @@ Global
 		{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|Win32.Build.0 = Release|Win32
 		{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|x64.ActiveCfg = Release|x64
 		{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|x64.Build.0 = Release|x64
+		{D233025A-231F-4A43-92B6-E87193C60ACC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D233025A-231F-4A43-92B6-E87193C60ACC}.Debug|Win32.Build.0 = Debug|Win32
+		{D233025A-231F-4A43-92B6-E87193C60ACC}.Debug|x64.ActiveCfg = Debug|Win32
+		{D233025A-231F-4A43-92B6-E87193C60ACC}.Release|Win32.ActiveCfg = Release|Win32
+		{D233025A-231F-4A43-92B6-E87193C60ACC}.Release|Win32.Build.0 = Release|Win32
+		{D233025A-231F-4A43-92B6-E87193C60ACC}.Release|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -200,7 +200,6 @@ Global
 		{4BC6906B-213E-40D7-9FC7-1A93E228393D} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
 		{731BD205-2826-4631-B7AF-117658E88DBC} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
 		{17836496-31B0-46F2-B1B1-366D7DF6F04C} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
-		{D233025A-231F-4A43-92B6-E87193C60ACC} = {0E0FCAC2-E128-4886-8EE6-1BCA84551F58}
 		{1133A1CC-A9E5-4026-B20D-6A2987130D4E} = {0E0FCAC2-E128-4886-8EE6-1BCA84551F58}
 		{B685BB34-D700-4FCC-8503-9B6AA1A0C95D} = {0E0FCAC2-E128-4886-8EE6-1BCA84551F58}
 		{593B00E6-1987-415D-A62C-26533FC3E95C} = {0E0FCAC2-E128-4886-8EE6-1BCA84551F58}

diff --git a/Source/Android/PluginAudio/AudioSettings.h b/Source/Android/PluginAudio/AudioSettings.h
diff --git a/Source/Android/PluginAudio/main.h b/Source/Android/PluginAudio/main.h
diff --git a/Source/Android/PluginAudio/trace.h b/Source/Android/PluginAudio/trace.h
diff --git a/Source/Common/SyncEvent.h b/Source/Common/SyncEvent.h
@@ -1,4 +1,5 @@
 #pragma once
+#include "stdtypes.h"
 
 class SyncEvent
 {