mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-04-21 21:52:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restore MP3 support; update configs

Browse source
This commit is contained in:
Struma 2022-04-02 19:58:49 -04:00
parent 27f3a404d3
commit 9c84e208db
11 changed files with 35 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
linux/Makefile
View file

@ -245,11 +245,10 @@ $(DOWNLOADS)/sdl_sound/cmakebuild/Makefile: $(DOWNLOADS)/sdl_sound/CMakeLists.tx
cd $(DOWNLOADS)/sdl_sound; mkdir -p cmakebuild; cd cmakebuild; \
$(CMAKE) \
-DSDLSOUND_BUILD_SHARED=false \
-DSDLSOUND_BUILD_TEST=false \
-DSDLSOUND_DECODER_MP3=false
-DSDLSOUND_BUILD_TEST=false
$(DOWNLOADS)/sdl_sound/CMakeLists.txt:
$(CLONE) $(GITLAB)/mkxp-z/SDL_sound $(DOWNLOADS)/sdl_sound -b v2.0
$(CLONE) $(GITLAB)/mkxp-z/SDL_sound $(DOWNLOADS)/sdl_sound -b git
# SDL2 (ttf)
sdl2ttf: init_dirs sdl2 freetype $(LIBDIR)/libSDL2_ttf.a

4
macos/Dependencies/dependencies.make
View file

@ -244,10 +244,10 @@ $(DOWNLOADS)/sdl_sound/cmakebuild/Makefile: $(DOWNLOADS)/sdl_sound/CMakeLists.tx
$(CMAKE) \
-DSDLSOUND_BUILD_SHARED=false \
-DSDLSOUND_BUILD_TEST=false \
-DSDLSOUND_DECODER_MP3=false
-DSDLSOUND_DECODER_COREAUDIO=false
$(DOWNLOADS)/sdl_sound/CMakeLists.txt:
$(CLONE) $(GITLAB)/mkxp-z/SDL_sound $(DOWNLOADS)/sdl_sound -b v2.0
$(CLONE) $(GITLAB)/mkxp-z/SDL_sound $(DOWNLOADS)/sdl_sound -b git
# SDL2 (ttf)

44
macos/mkxp-z.xcodeproj/project.pbxproj
View file

@ -2013,7 +2013,7 @@
3BDB22EC25644FBF00C4A63D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1300;
LastUpgradeCheck = 1330;
TargetAttributes = {
3B1C235525A199370075EF5D = {
CreatedOnToolsVersion = 12.3;
@ -2533,7 +2533,6 @@
LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/Dependencies/Frameworks/steam/sdk/redistributable_bin/osx";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "org.struma.mkxp-z";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@ -2643,7 +2642,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.3.0;
CURRENT_PROJECT_VERSION = 2.3.1;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -2671,11 +2670,10 @@
"$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
);
MARKETING_VERSION = 2.3.0;
MARKETING_VERSION = 2.3.1;
MKXPZ_EXECUTABLE_NAME = shim;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_CODE_SIGN_FLAGS = "--deep";
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = "org.struma.mkxp-z";
@ -2719,7 +2717,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.3.0;
CURRENT_PROJECT_VERSION = 2.3.1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -2745,7 +2743,7 @@
"$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
);
MARKETING_VERSION = 2.3.0;
MARKETING_VERSION = 2.3.1;
MKXPZ_EXECUTABLE_NAME = shim;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
@ -2927,7 +2925,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.3.0;
CURRENT_PROJECT_VERSION = 2.3.1;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -2969,11 +2967,10 @@
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
"$(PROJECT_DIR)/Dependencies/build-macosx-universal/lib",
);
MARKETING_VERSION = 2.3.0;
MARKETING_VERSION = 2.3.1;
MKXPZ_EXECUTABLE_NAME = shim;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_CODE_SIGN_FLAGS = "--deep";
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = "org.struma.mkxp-z";
@ -3017,7 +3014,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.3.0;
CURRENT_PROJECT_VERSION = 2.3.1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -3057,7 +3054,7 @@
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
"$(PROJECT_DIR)/Dependencies/build-macosx-universal/lib",
);
MARKETING_VERSION = 2.3.0;
MARKETING_VERSION = 2.3.1;
MKXPZ_EXECUTABLE_NAME = shim;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
@ -3105,7 +3102,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.3.0;
CURRENT_PROJECT_VERSION = 2.3.1;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -3143,10 +3140,9 @@
"$(PROJECT_DIR)/Dependencies/build-macosx-universal/lib",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
);
MARKETING_VERSION = 2.3.0;
MARKETING_VERSION = 2.3.1;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = "org.struma.mkxp-z";
PROVISIONING_PROFILE_SPECIFIER = "";
@ -3189,7 +3185,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.3.0;
CURRENT_PROJECT_VERSION = 2.3.1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -3225,7 +3221,7 @@
"$(PROJECT_DIR)/Dependencies/build-macosx-universal/lib",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
);
MARKETING_VERSION = 2.3.0;
MARKETING_VERSION = 2.3.1;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "";
@ -3270,7 +3266,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.3.0;
CURRENT_PROJECT_VERSION = 2.3.1;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -3294,10 +3290,9 @@
"$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
);
MARKETING_VERSION = 2.3.0;
MARKETING_VERSION = 2.3.1;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = "org.struma.mkxp-z";
PROVISIONING_PROFILE_SPECIFIER = "";
@ -3340,7 +3335,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.3.0;
CURRENT_PROJECT_VERSION = 2.3.1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -3362,7 +3357,7 @@
"$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
);
MARKETING_VERSION = 2.3.0;
MARKETING_VERSION = 2.3.1;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "";
@ -3433,9 +3428,8 @@
"$(PROJECT_DIR)/Dependencies/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.12.2;
ONLY_ACTIVE_ARCH = YES;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "-fdeclspec";
OTHER_CODE_SIGN_FLAGS = "--ignore-resources";
PRODUCT_BUNDLE_IDENTIFIER = "org.zoro.mkxp-z";
PRODUCT_NAME = "$(TARGET_NAME)";
WARNING_CFLAGS = "-Wno-documentation";
@ -3503,8 +3497,8 @@
"$(PROJECT_DIR)/Dependencies/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.12.2;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "-fdeclspec";
OTHER_CODE_SIGN_FLAGS = "--ignore-resources";
PRODUCT_BUNDLE_IDENTIFIER = "org.zoro.mkxp-z";
PRODUCT_NAME = "$(TARGET_NAME)";
WARNING_CFLAGS = "-Wno-documentation";

2
macos/mkxp-z.xcodeproj/xcshareddata/xcschemes/Intel (Steam).xcscheme
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1330"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
macos/mkxp-z.xcodeproj/xcshareddata/xcschemes/Intel.xcscheme
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1330"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
macos/mkxp-z.xcodeproj/xcshareddata/xcschemes/Universal (Steam).xcscheme
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1330"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
macos/mkxp-z.xcodeproj/xcshareddata/xcschemes/Universal.xcscheme
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1330"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
macos/mkxp-z.xcodeproj/xcshareddata/xcschemes/shim.xcscheme
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1330"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
meson.build
View file

@ -1,4 +1,4 @@
project('mkxp-z', 'c', 'cpp', version: '2.3.0', meson_version: '>=0.51.0', default_options: ['cpp_std=c++14', 'buildtype=release'])
project('mkxp-z', 'c', 'cpp', version: '2.3.1', meson_version: '>=0.51.0', default_options: ['cpp_std=c++14', 'buildtype=release'])
host_system = host_machine.system()

5
windows/Makefile
View file

@ -228,11 +228,10 @@ $(DOWNLOADS)/sdl_sound/cmakebuild/Makefile: $(DOWNLOADS)/sdl_sound/CMakeLists.tx
cd $(DOWNLOADS)/sdl_sound; mkdir -p cmakebuild; cd cmakebuild; \
$(CMAKE) \
-DSDLSOUND_BUILD_SHARED=false \
-DSDLSOUND_BUILD_TEST=false \
-DSDLSOUND_DECODER_MP3=false
-DSDLSOUND_BUILD_TEST=false
$(DOWNLOADS)/sdl_sound/CMakeLists.txt:
$(CLONE) $(GITLAB)/mkxp-z/SDL_sound $(DOWNLOADS)/sdl_sound -b v2.0
$(CLONE) $(GITLAB)/mkxp-z/SDL_sound $(DOWNLOADS)/sdl_sound -b git
# SDL2 (ttf)
sdl2ttf: init_dirs sdl2 freetype $(LIBDIR)/libSDL2_ttf.a

8
windows/resource.rc
View file

@ -4,17 +4,17 @@
IDI_APPICON ICON "icon.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,3,0,0
PRODUCTVERSION 2,3,0,0
FILEVERSION 2,3,1,0
PRODUCTVERSION 2,3,1,0
{
BLOCK "StringFileInfo"
{
BLOCK "040904b0"
{
VALUE "FileVersion", "2.3.0\0"
VALUE "FileVersion", "2.3.1\0"
VALUE "OriginalFilename", "mkxp-z.exe\0"
VALUE "ProductName", "mkxp-z\0"
VALUE "ProductVersion", "2.3.0\0"
VALUE "ProductVersion", "2.3.1\0"
}
}
BLOCK "VarFileInfo"