ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Audio] Move audio plugin folder

This commit is contained in:
zilmar 2017-09-11 19:14:33 +10:00
parent 081eae6f01
commit fe90aaff03
15 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Android/Script/copySource.cmd
View File

@ -23,10 +23,6 @@ echo copy Common
xcopy "%base_dir%/Source/Common" "%base_dir%/Android/jni/Common/" /D /I /F /Y /E xcopy "%base_dir%/Source/Common" "%base_dir%/Android/jni/Common/" /D /I /F /Y /E
IF %ERRORLEVEL% NEQ 0 (exit /B 1) 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 echo copy PluginInput
xcopy "%base_dir%/Source/Android/PluginInput" "%base_dir%/Android/jni/PluginInput/" /D /I /F /Y /E xcopy "%base_dir%/Source/Android/PluginInput" "%base_dir%/Android/jni/PluginInput/" /D /I /F /Y /E
IF %ERRORLEVEL% NEQ 0 (exit /B 1) 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 xcopy "%base_dir%/Source/Android/Bridge" "%base_dir%/Android/jni/Project64-bridge/" /D /I /F /Y /E
IF %ERRORLEVEL% NEQ 0 (exit /B 1) 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 echo copy Project64-core
xcopy "%base_dir%/Source/Project64-core" "%base_dir%/Android/jni/Project64-core/" /D /I /F /Y /E xcopy "%base_dir%/Source/Project64-core" "%base_dir%/Android/jni/Project64-core/" /D /I /F /Y /E
IF %ERRORLEVEL% NEQ 0 (exit /B 1) IF %ERRORLEVEL% NEQ 0 (exit /B 1)

6
Android/copySource.xml
View File

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

2
Android/jni/Android.mk
View File

@ -21,9 +21,9 @@ COMMON_CPPFLAGS := \
include $(JNI_LOCAL_PATH)/3rdParty/png/png.mk include $(JNI_LOCAL_PATH)/3rdParty/png/png.mk
include $(JNI_LOCAL_PATH)/3rdParty/zlib/zlib.mk include $(JNI_LOCAL_PATH)/3rdParty/zlib/zlib.mk
include $(JNI_LOCAL_PATH)/Common/common.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)/PluginInput/PluginInput.mk
include $(JNI_LOCAL_PATH)/PluginRSP/PluginRSP.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-bridge/Project64-bridge.mk
include $(JNI_LOCAL_PATH)/Project64-core/Project64-core.mk include $(JNI_LOCAL_PATH)/Project64-core/Project64-core.mk
include $(JNI_LOCAL_PATH)/Project64-video/Project64-video.mk include $(JNI_LOCAL_PATH)/Project64-video/Project64-video.mk

0
Android/jni/PluginAudio/.gitignore → Android/jni/Project64-audio/.gitignore vendored
View File

17
Project64.sln
View File

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

0
Source/Android/PluginAudio/AudioSettings.cpp → Source/Project64-audio/AudioSettings.cpp
View File

0
Source/Android/PluginAudio/AudioSettings.h → Source/Project64-audio/AudioSettings.h
View File

0
Source/Android/PluginAudio/Audio_1.1.h → Source/Project64-audio/Audio_1.1.h
View File

0
Source/Android/PluginAudio/Main.cpp → Source/Project64-audio/Main.cpp
View File

4
Source/Android/PluginAudio/PluginAudio.vcxproj → Source/Project64-audio/PluginAudio.vcxproj
View File

@ -48,10 +48,10 @@
<ClInclude Include="Version.h" /> <ClInclude Include="Version.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Common\Common.vcxproj"> <ProjectReference Include="..\Common\Common.vcxproj">
<Project>{b4a4b994-9111-42b1-93c2-6f1ca8bc4421}</Project> <Project>{b4a4b994-9111-42b1-93c2-6f1ca8bc4421}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Settings\Settings.vcxproj"> <ProjectReference Include="..\Settings\Settings.vcxproj">
<Project>{8b9961b1-88d9-4ea3-a752-507a00dd9f3d}</Project> <Project>{8b9961b1-88d9-4ea3-a752-507a00dd9f3d}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>

0
Source/Android/PluginAudio/PluginAudio.vcxproj.filters → Source/Project64-audio/PluginAudio.vcxproj.filters
View File

0
Source/Android/PluginAudio/Version.h → Source/Project64-audio/Version.h
View File

0
Source/Android/PluginAudio/main.h → Source/Project64-audio/main.h
View File

0
Source/Android/PluginAudio/trace.cpp → Source/Project64-audio/trace.cpp
View File

0
Source/Android/PluginAudio/trace.h → Source/Project64-audio/trace.h
View File