Browse Source

Project file update for new sound play model

louyihua 8 years ago
parent
commit
439e9253c3

+ 1 - 0
android/jni/src/Android.mk

@@ -10,6 +10,7 @@ OGG_PATH := ../../../liboggvorbis
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(SDL_PATH)/include $(LOCAL_PATH)/$(OGG_PATH)/include $(LOCAL_PATH)/$(OGG_PATH)/src
 
 LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
+	../../../audio.c \
 	../../../battle.c \
 	../../../ending.c \
 	../../../fight.c \

+ 1 - 0
audio.c

@@ -395,6 +395,7 @@ AUDIO_CloseDevice(
 
    SDL_mutexV(gAudioDevice.mtx);
    SDL_DestroyMutex(gAudioDevice.mtx);
+   gAudioDevice.mtx = NULL;
 }
 
 SDL_AudioSpec*

+ 2 - 1
winrt/SDLPal.UWP/SDLPal.Core.vcxproj

@@ -317,7 +317,7 @@
     <ClInclude Include="..\..\rngplay.h" />
     <ClInclude Include="..\..\scene.h" />
     <ClInclude Include="..\..\script.h" />
-    <ClInclude Include="..\..\sound.h" />
+    <ClInclude Include="..\..\audio.h" />
     <ClInclude Include="..\..\text.h" />
     <ClInclude Include="..\..\ui.h" />
     <ClInclude Include="..\..\uibattle.h" />
@@ -339,6 +339,7 @@
     <ClCompile Include="..\..\adplug\player.cpp" />
     <ClCompile Include="..\..\adplug\rix.cpp" />
     <ClCompile Include="..\..\adplug\surroundopl.cpp" />
+    <ClCompile Include="..\..\audio.c" />
     <ClCompile Include="..\..\battle.c" />
     <ClCompile Include="..\..\ending.c" />
     <ClCompile Include="..\..\fight.c" />

+ 4 - 1
winrt/SDLPal.UWP/SDLPal.Core.vcxproj.filters

@@ -341,7 +341,7 @@
     <ClInclude Include="..\..\script.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\sound.h">
+    <ClInclude Include="..\..\audio.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\text.h">
@@ -415,6 +415,9 @@
     <ClCompile Include="..\..\adplug\demuopl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\audio.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\liboggvorbis\src\analysis.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>

+ 2 - 1
winrt/SDLPal.Windows/SDLPal.Core.vcxproj

@@ -299,7 +299,7 @@
     <ClInclude Include="..\..\rngplay.h" />
     <ClInclude Include="..\..\scene.h" />
     <ClInclude Include="..\..\script.h" />
-    <ClInclude Include="..\..\sound.h" />
+    <ClInclude Include="..\..\audio.h" />
     <ClInclude Include="..\..\text.h" />
     <ClInclude Include="..\..\ui.h" />
     <ClInclude Include="..\..\uibattle.h" />
@@ -321,6 +321,7 @@
     <ClCompile Include="..\..\adplug\player.cpp" />
     <ClCompile Include="..\..\adplug\rix.cpp" />
     <ClCompile Include="..\..\adplug\surroundopl.cpp" />
+    <ClCompile Include="..\..\audio.c" />
     <ClCompile Include="..\..\battle.c" />
     <ClCompile Include="..\..\ending.c" />
     <ClCompile Include="..\..\fight.c" />

+ 4 - 1
winrt/SDLPal.Windows/SDLPal.Core.vcxproj.filters

@@ -341,7 +341,7 @@
     <ClInclude Include="..\..\script.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\sound.h">
+    <ClInclude Include="..\..\audio.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\text.h">
@@ -415,6 +415,9 @@
     <ClCompile Include="..\..\adplug\demuopl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\audio.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\liboggvorbis\src\analysis.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>

+ 2 - 1
winrt/SDLPal.WindowsPhone/SDLPal.Core.vcxproj

@@ -244,7 +244,7 @@
     <ClInclude Include="..\..\rngplay.h" />
     <ClInclude Include="..\..\scene.h" />
     <ClInclude Include="..\..\script.h" />
-    <ClInclude Include="..\..\sound.h" />
+    <ClInclude Include="..\..\audio.h" />
     <ClInclude Include="..\..\text.h" />
     <ClInclude Include="..\..\ui.h" />
     <ClInclude Include="..\..\uibattle.h" />
@@ -266,6 +266,7 @@
     <ClCompile Include="..\..\adplug\player.cpp" />
     <ClCompile Include="..\..\adplug\rix.cpp" />
     <ClCompile Include="..\..\adplug\surroundopl.cpp" />
+    <ClCompile Include="..\..\audio.c" />
     <ClCompile Include="..\..\battle.c" />
     <ClCompile Include="..\..\ending.c" />
     <ClCompile Include="..\..\fight.c" />

+ 4 - 1
winrt/SDLPal.WindowsPhone/SDLPal.Core.vcxproj.filters

@@ -341,7 +341,7 @@
     <ClInclude Include="..\..\script.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\sound.h">
+    <ClInclude Include="..\..\audio.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\text.h">
@@ -415,6 +415,9 @@
     <ClCompile Include="..\..\adplug\demuopl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\audio.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\liboggvorbis\src\analysis.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>