[OMPT-svn-commit] OpenMPT r22792 - in branches/OpenMPT-1.29: . build/genie build/premake build/xcode-genie

[<sv...@op...>]

Author: manx
Date: Sat Jan  4 15:13:47 2025
New Revision: 22792
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22792

Log:
Merged revision(s) 22788 from branches/OpenMPT-1.30:
Merged revision(s) 22784 from branches/OpenMPT-1.31:
Merged revision(s) 22774 from trunk/OpenMPT:
[Mod] build: premake: mpg123: Use generic config.h.
........
........
........

Modified:
   branches/OpenMPT-1.29/   (props changed)
   branches/OpenMPT-1.29/build/genie/ext-mpg123.lua
   branches/OpenMPT-1.29/build/premake/ext-mpg123.lua
   branches/OpenMPT-1.29/build/xcode-genie/ext-mpg123.lua

Modified: branches/OpenMPT-1.29/build/genie/ext-mpg123.lua
==============================================================================
--- branches/OpenMPT-1.29/build/genie/ext-mpg123.lua	Sat Jan  4 15:13:11 2025	(r22791)
+++ branches/OpenMPT-1.29/build/genie/ext-mpg123.lua	Sat Jan  4 15:13:47 2025	(r22792)
@@ -9,7 +9,7 @@
   dofile "../../build/genie/genie-defaults-winver.lua"
   targetname "openmpt-mpg123"
   includedirs {
-   "../../include/mpg123/ports/MSVC++",
+   "../../include/mpg123/ports/generic",
    "../../include/mpg123/src/include",
   }
   flags { "Unicode" }

Modified: branches/OpenMPT-1.29/build/premake/ext-mpg123.lua
==============================================================================
--- branches/OpenMPT-1.29/build/premake/ext-mpg123.lua	Sat Jan  4 15:13:11 2025	(r22791)
+++ branches/OpenMPT-1.29/build/premake/ext-mpg123.lua	Sat Jan  4 15:13:47 2025	(r22792)
@@ -9,7 +9,7 @@
   dofile "../../build/premake/premake-defaults-winver.lua"
   targetname "openmpt-mpg123"
   includedirs {
-   "../../include/mpg123/ports/MSVC++",
+   "../../include/mpg123/ports/generic",
    "../../include/mpg123/src/include",
   }
 	filter {}

Modified: branches/OpenMPT-1.29/build/xcode-genie/ext-mpg123.lua
==============================================================================
--- branches/OpenMPT-1.29/build/xcode-genie/ext-mpg123.lua	Sat Jan  4 15:13:11 2025	(r22791)
+++ branches/OpenMPT-1.29/build/xcode-genie/ext-mpg123.lua	Sat Jan  4 15:13:47 2025	(r22792)
@@ -8,7 +8,7 @@
   dofile "../../build/xcode-genie/genie-defaults.lua"
   targetname "openmpt-mpg123"
   includedirs {
-   "../../include/mpg123/ports/Xcode",
+   "../../include/mpg123/ports/generic",
    "../../include/mpg123/src/include",
   }
   files {