Bump package to 5.2.10.0, deps to 1.15.0

liballeg · Nov 28, 2024 · 632b828 · 632b828
1 parent df081c8
commit 632b828
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 13 deletions.
diff --git a/universal/Allegro.nuspec b/universal/Allegro.nuspec
@@ -3,7 +3,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>Allegro</id>
-    <version>5.2.10.0-nightly.20241007</version>
+    <version>5.2.10.0</version>
     <title>Allegro Game Programming Library</title>
     <authors>Allegro Developers</authors>
     <owners>Allegro Developers</owners>
@@ -18,7 +18,7 @@
     <tags>Native</tags>
     <dependencies>
       <group>
-        <dependency id="AllegroDeps" version="[1.15.0.0-nightly.20241007]" />
+        <dependency id="AllegroDeps" version="[1.15.0.0]" />
       </group>
     </dependencies>
   </metadata>

diff --git a/universal/AllegroDeps.nuspec b/universal/AllegroDeps.nuspec
@@ -3,7 +3,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>AllegroDeps</id>
-    <version>1.15.0.0-nightly.20241007</version>
+    <version>1.15.0.0</version>
     <title>Allegro Dependencies Package</title>
     <authors>Allegro Developers</authors>
     <owners>Allegro Developers</owners>
@@ -39,6 +39,7 @@
     <file src="nupkg\v142\win32\deps\lib\webpdecoder.lib" target="build\native\v142\win32\deps\lib\" />
     <file src="nupkg\v142\win32\deps\lib\webpdemux.lib" target="build\native\v142\win32\deps\lib\" />
     <file src="nupkg\v142\win32\deps\lib\sharpyuv.lib" target="build\native\v142\win32\deps\lib\" />
+    <file src="nupkg\v142\win32\deps\lib\openmpt.lib" target="build\native\v142\win32\deps\lib\" />
     <file src="nupkg\v142\x64\deps\lib\dumb.lib" target="build\native\v142\x64\deps\lib\" />
     <file src="nupkg\v142\x64\deps\lib\FLAC.lib" target="build\native\v142\x64\deps\lib\" />
     <file src="nupkg\v142\x64\deps\lib\freetype.lib" target="build\native\v142\x64\deps\lib\" />
@@ -56,6 +57,7 @@
     <file src="nupkg\v142\x64\deps\lib\webpdecoder.lib" target="build\native\v142\x64\deps\lib\" />
     <file src="nupkg\v142\x64\deps\lib\webpdemux.lib" target="build\native\v142\x64\deps\lib\" />
     <file src="nupkg\v142\x64\deps\lib\sharpyuv.lib" target="build\native\v142\x64\deps\lib\" />
+    <file src="nupkg\v142\x64\deps\lib\openmpt.lib" target="build\native\v142\x64\deps\lib\" />
     <file src="nupkg\v143\win32\deps\lib\dumb.lib" target="build\native\v143\win32\deps\lib\" />
     <file src="nupkg\v143\win32\deps\lib\FLAC.lib" target="build\native\v143\win32\deps\lib\" />
     <file src="nupkg\v143\win32\deps\lib\freetype.lib" target="build\native\v143\win32\deps\lib\" />
@@ -73,6 +75,7 @@
     <file src="nupkg\v143\win32\deps\lib\webpdecoder.lib" target="build\native\v143\win32\deps\lib\" />
     <file src="nupkg\v143\win32\deps\lib\webpdemux.lib" target="build\native\v143\win32\deps\lib\" />
     <file src="nupkg\v143\win32\deps\lib\sharpyuv.lib" target="build\native\v143\win32\deps\lib\" />
+    <file src="nupkg\v143\win32\deps\lib\openmpt.lib" target="build\native\v143\win32\deps\lib\" />
     <file src="nupkg\v143\x64\deps\lib\dumb.lib" target="build\native\v143\x64\deps\lib\" />
     <file src="nupkg\v143\x64\deps\lib\FLAC.lib" target="build\native\v143\x64\deps\lib\" />
     <file src="nupkg\v143\x64\deps\lib\freetype.lib" target="build\native\v143\x64\deps\lib\" />
@@ -90,6 +93,7 @@
     <file src="nupkg\v143\x64\deps\lib\webpdecoder.lib" target="build\native\v143\x64\deps\lib\" />
     <file src="nupkg\v143\x64\deps\lib\webpdemux.lib" target="build\native\v143\x64\deps\lib\" />
     <file src="nupkg\v143\x64\deps\lib\sharpyuv.lib" target="build\native\v143\x64\deps\lib\" />
+    <file src="nupkg\v143\x64\deps\lib\openmpt.lib" target="build\native\v143\x64\deps\lib\" />
     <file src="nupkg\ClangCL\win32\deps\lib\dumb.lib" target="build\native\ClangCL\win32\deps\lib\" />
     <file src="nupkg\ClangCL\win32\deps\lib\FLAC.lib" target="build\native\ClangCL\win32\deps\lib\" />
     <file src="nupkg\ClangCL\win32\deps\lib\freetype.lib" target="build\native\ClangCL\win32\deps\lib\" />
@@ -107,6 +111,7 @@
     <file src="nupkg\ClangCL\win32\deps\lib\webpdecoder.lib" target="build\native\ClangCL\win32\deps\lib\" />
     <file src="nupkg\ClangCL\win32\deps\lib\webpdemux.lib" target="build\native\ClangCL\win32\deps\lib\" />
     <file src="nupkg\ClangCL\win32\deps\lib\sharpyuv.lib" target="build\native\ClangCL\win32\deps\lib\" />
+    <file src="nupkg\ClangCL\win32\deps\lib\openmpt.lib" target="build\native\ClangCL\win32\deps\lib\" />
     <file src="nupkg\ClangCL\x64\deps\lib\dumb.lib" target="build\native\ClangCL\x64\deps\lib\" />
     <file src="nupkg\ClangCL\x64\deps\lib\FLAC.lib" target="build\native\ClangCL\x64\deps\lib\" />
     <file src="nupkg\ClangCL\x64\deps\lib\freetype.lib" target="build\native\ClangCL\x64\deps\lib\" />
@@ -124,5 +129,6 @@
     <file src="nupkg\ClangCL\x64\deps\lib\webpdecoder.lib" target="build\native\ClangCL\x64\deps\lib\" />
     <file src="nupkg\ClangCL\x64\deps\lib\webpdemux.lib" target="build\native\ClangCL\x64\deps\lib\" />
     <file src="nupkg\ClangCL\x64\deps\lib\sharpyuv.lib" target="build\native\ClangCL\x64\deps\lib\" />
+    <file src="nupkg\ClangCL\x64\deps\lib\openmpt.lib" target="build\native\ClangCL\x64\deps\lib\" />
   </files>
 </package>
diff --git a/universal/AllegroDeps.targets b/universal/AllegroDeps.targets
@@ -43,8 +43,8 @@
       $(AllegroLib)vorbisfile.lib;
       $(AllegroLib)ogg.lib;
       $(AllegroLib)opus.lib;
-      $(AllegroLib)opusfile.lib
-      $(AllegroLib)libopenmpt.lib
+      $(AllegroLib)opusfile.lib;
+      $(AllegroLib)openmpt.lib
     </Allegro_AddonAcodecDeps>
   </PropertyGroup>
 

diff --git a/universal/build_deps_msys.sh b/universal/build_deps_msys.sh
@@ -94,5 +94,5 @@ make install ${parallel}
 
 mkdir -p "${build_dir}/libopenmpt"
 cd ${build_dir}/libopenmpt
-eval cmake "${root}/libopenmpt-0.7.11" ${common_args}
+eval cmake "${root}/libopenmpt-0.7.11" ${common_args} -DCMAKE_BUILD_TYPE=Release
 make install ${parallel}
diff --git a/universal/build_nuget.cmd b/universal/build_nuget.cmd
@@ -168,7 +168,7 @@ call :makedep opusfile-0.12
 call :makedep libwebp-1.3.2 "-DWEBP_BUILD_ANIM_UTILS=off" "-DWEBP_BUILD_CWEBP=off" "-DWEBP_BUILD_DWEBP=off" ^
 	 "-DWEBP_BUILD_GIF2WEBP=off" "-DWEBP_BUILD_IMG2WEBP=off" "-DWEBP_BUILD_VWEBP=off" "-DWEBP_BUILD_WEBPINFO=off" "-DWEBP_BUILD_WEBPMUX=off" ^
 	 "-DWEBP_BUILD_EXTRAS=off" "-DWEBP_BUILD_LIBWEBPMUX=off"
-call :makedep libopenmpt-0.7.11
+call :makedep_release libopenmpt-0.7.11
 goto :EOF
 
 :makedep
@@ -181,6 +181,16 @@ cmake  %args% %* "%root%\%dep_name%"  || goto :error
 cmake --build . --target INSTALL --config RelWithDebInfo -j %jobs% || goto :error
 goto :EOF
 
+:makedep_release
+set dep_name=%1
+shift
+echo ***** Building Dependency %dep_name% *****
+mkdir "%buildroot%\%dep_name%"
+cd %buildroot%\%dep_name%
+cmake  %args% %* "%root%\%dep_name%"  || goto :error
+cmake --build . --target INSTALL --config Release -j %jobs% || goto :error
+goto :EOF
+
 :error
 @echo Failed with error #%errorlevel%.
 exit /b %errorlevel%
diff --git a/universal/create_nuspec.py b/universal/create_nuspec.py
@@ -3,8 +3,8 @@
 import argparse
 
 parser = argparse.ArgumentParser()
-parser.add_argument('--allegro_version', default='5.2.10.0-nightly.20241007')
-parser.add_argument('--allegro_deps_version', default='1.15.0.0-nightly.20241007')
+parser.add_argument('--allegro_version', default='5.2.10.0')
+parser.add_argument('--allegro_deps_version', default='1.15.0.0')
 parser.add_argument('--toolchains', default='v142,v143,ClangCL')
 parser.add_argument('--bits', default='win32,x64')
 ARGS = parser.parse_args()
@@ -108,6 +108,7 @@
 	"webpdecoder.lib",
 	"webpdemux.lib",
 	"sharpyuv.lib",
+	"openmpt.lib",
 ]
 
 def make_line(bits, version, dll_loc, filename):

diff --git a/universal/package_msys.sh b/universal/package_msys.sh
@@ -3,10 +3,10 @@
 set -x
 set -e
 
-ALLEGRO_VERSION=5.2.9.0
-DEPS_VERSION=1.14.0
-GCC_VERSION_32=13.2.0
-GCC_VERSION_64=13.2.0
+ALLEGRO_VERSION=5.2.10.0
+DEPS_VERSION=1.15.0
+GCC_VERSION_32=14.2.0
+GCC_VERSION_64=14.2.0
 
 make_deps_package() {
 	# $1 - path to copy from