[fix] Minor FMOD update, required for forward compatibility

YoYoGames · Jul 1, 2024 · 5ec8ce4 · 5ec8ce4
1 parent df84d00
commit 5ec8ce4
Show file tree

Hide file tree

Showing 119 changed files with 920 additions and 894 deletions.
diff --git a/source/fmod_gml/FMOD.yyp b/source/fmod_gml/FMOD.yyp
diff --git a/source/fmod_gml/extensions/FMOD/FMOD.yy b/source/fmod_gml/extensions/FMOD/FMOD.yy
diff --git a/source/fmod_gml/extensions/FMOD/YYFMOD.dll b/source/fmod_gml/extensions/FMOD/YYFMOD.dll
diff --git a/source/fmod_gml/extensions/FMOD/YYFMOD.ext b/source/fmod_gml/extensions/FMOD/YYFMOD.ext
diff --git a/source/fmod_gml/extensions/FMOD/YYFMOD_x64.dll b/source/fmod_gml/extensions/FMOD/YYFMOD_x64.dll
diff --git a/source/fmod_gml/extensions/FMOD/fmod_windows/FMOD/FMOD.vcxproj b/source/fmod_gml/extensions/FMOD/fmod_windows/FMOD/FMOD.vcxproj
@@ -73,9 +73,11 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <TargetName>$(ProjectName)_$(Platform)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)_$(Platform)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>

diff --git a/source/fmod_gml/extensions/FMOD/post_build_step.bat b/source/fmod_gml/extensions/FMOD/post_build_step.bat
@@ -52,15 +52,19 @@ set "ERROR_SDK_HASH=Invalid FMOD SDK version, sha256 hash mismatch (expected v%S
 :: call %Utils% versionLockCheck "%YYruntimeVersion%" %RUNTIME_VERSION_STABLE% %RUNTIME_VERSION_BETA% %RUNTIME_VERSION_DEV% %RUNTIME_VERSION_LTS%
 
 :: Ensure we are on the output path
-pushd "%YYoutputFolder%"
+if "%YYTARGET_runtime%" == "GMRT" (
+    pushd "%YYoutputFolder%\build\assets"
+) else (
+    pushd "%YYoutputFolder%"
+)
 
 :: Call setup method depending on the platform
 :: NOTE: the setup method can be (:setupWindows, :setupMacOS, :setupLinux, :setupAndroid, :setupiOS, :setupXbox, :setupPlaystation, :setupSwitch)
 call :setup%YYPLATFORM_name%
 
 popd
 
-exit 0
+exit %ERRORLEVEL%
 
 :: ----------------------------------------------------------------------------------------------------
 :setupWindows

diff --git a/source/fmod_gml/extensions/FMOD/pre_build_step.bat b/source/fmod_gml/extensions/FMOD/pre_build_step.bat
@@ -2,6 +2,9 @@
 set Utils="%~dp0scriptUtils.bat"
 set "ExtensionPath=%~dp0"
 
+set
+exit 1
+
 :: ######################################################################################
 :: Script Logic
 
@@ -14,6 +17,8 @@ call %Utils% optionGetValue "versionBeta" RUNTIME_VERSION_BETA
 call %Utils% optionGetValue "versionDev" RUNTIME_VERSION_DEV
 call %Utils% optionGetValue "versionLTS" RUNTIME_VERSION_LTS
 
+call %Utils% optionGetValue "gmrtReady" GMRT_READY
+
 :: SDK Version
 call %Utils% optionGetValue "sdkVersion" SDK_VERSION
 
@@ -36,7 +41,13 @@ if "%ENABLE_STUDIO%"=="True" set "ENABLE_STUDIO_FLAG=1"
 set "ERROR_SDK_HASH=Invalid FMOD SDK version, sha256 hash mismatch (expected v%SDK_VERSION%)."
 
 :: Checks IDE and Runtime versions
-call %Utils% versionLockCheck "%YYruntimeVersion%" %RUNTIME_VERSION_STABLE% %RUNTIME_VERSION_BETA% %RUNTIME_VERSION_DEV% %RUNTIME_VERSION_LTS%
+if "%YYTARGET_runtime%" == "GMRT" (
+    if "%GMRT_READY%" neq "True" (
+        call %Utils% logError "Extension is not compatible with GMRT runtime. Check for updated version."
+    )
+) else (
+    call %Utils% versionLockCheck "%YYruntimeVersion%" %RUNTIME_VERSION_STABLE% %RUNTIME_VERSION_BETA% %RUNTIME_VERSION_DEV% %RUNTIME_VERSION_LTS%
+)
 
 :: Ensure we are on the output path
 pushd "%YYoutputFolder%"
@@ -47,7 +58,7 @@ call :setup%YYPLATFORM_name%
 
 popd
 
-exit 0
+exit %ERRORLEVEL%
 
 :: ----------------------------------------------------------------------------------------------------
 :setupWindows

diff --git a/...ml/objects/Obj_Fmod_Convolution_Reverb_Dry_Minus/obj_fmod_convolution_reverb_dry_minus.yy b/...ml/objects/Obj_Fmod_Convolution_Reverb_Dry_Minus/obj_fmod_convolution_reverb_dry_minus.yy
diff --git a/..._gml/objects/Obj_Fmod_Convolution_Reverb_Dry_Plus/obj_fmod_convolution_reverb_dry_plus.yy b/..._gml/objects/Obj_Fmod_Convolution_Reverb_Dry_Plus/obj_fmod_convolution_reverb_dry_plus.yy
diff --git a/...ml/objects/Obj_Fmod_Convolution_Reverb_Wet_Minus/obj_fmod_convolution_reverb_wet_minus.yy b/...ml/objects/Obj_Fmod_Convolution_Reverb_Wet_Minus/obj_fmod_convolution_reverb_wet_minus.yy
diff --git a/..._gml/objects/Obj_Fmod_Convolution_Reverb_Wet_Plus/obj_fmod_convolution_reverb_wet_plus.yy b/..._gml/objects/Obj_Fmod_Convolution_Reverb_Wet_Plus/obj_fmod_convolution_reverb_wet_plus.yy
diff --git a/source/fmod_gml/objects/Obj_Fmod_DSP_Speaker_Pan_Left/obj_fmod_dsp_speaker_pan_left.yy b/source/fmod_gml/objects/Obj_Fmod_DSP_Speaker_Pan_Left/obj_fmod_dsp_speaker_pan_left.yy
diff --git a/source/fmod_gml/objects/Obj_Fmod_DSP_Speaker_Pan_Right/obj_fmod_dsp_speaker_pan_right.yy b/source/fmod_gml/objects/Obj_Fmod_DSP_Speaker_Pan_Right/obj_fmod_dsp_speaker_pan_right.yy
diff --git a/source/fmod_gml/objects/obj_console_pointer/obj_console_pointer.yy b/source/fmod_gml/objects/obj_console_pointer/obj_console_pointer.yy
diff --git a/source/fmod_gml/objects/obj_fmod/obj_fmod.yy b/source/fmod_gml/objects/obj_fmod/obj_fmod.yy
diff --git a/source/fmod_gml/objects/obj_fmod_3d/CleanUp_0.gml b/source/fmod_gml/objects/obj_fmod_3d/CleanUp_0.gml
@@ -1,3 +1,4 @@
 
 fmod_sound_release(sound_index_1)
 fmod_sound_release(sound_index_2)
+
diff --git a/source/fmod_gml/objects/obj_fmod_3d/Create_0.gml b/source/fmod_gml/objects/obj_fmod_3d/Create_0.gml
@@ -28,7 +28,7 @@ sound_index_2 = fmod_system_create_sound(fmod_path_bundle("jaguar.wav"),FMOD_MOD
 
 fmod_sound_set_3d_min_max_distance(sound_index_2,DISTANCEFACTOR*0.5,DISTANCEFACTOR*5000)
 
-channel2 =fmod_system_play_sound(sound_index_2,true)
+channel2 = fmod_system_play_sound(sound_index_2,true)
 
 fmod_channel_control_set_3d_attributes(channel2, {x:point_2[0],y:point_2[1],z:point_2[2]},{x:0,y:0,z:0})
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@

		fmod_sound_release(sound_index_1)
		fmod_sound_release(sound_index_2)