Skip to content

Commit

Permalink
macOS tweaks for 1.9.7 (#213)
Browse files Browse the repository at this point in the history 
Update macOS build.
* Update references to Nlohmann JSON headers in the Xcode project.
* Bump the bundle version number for the macOS client.
  • Loading branch information
@bendoughty
bendoughty authored Oct 27, 2024
1 parent ba962d6 commit c1c2c54
Showing 1 changed file with 17 additions and 15 deletions.
32 changes: 17 additions & 15 deletions macosx/Eternal Lands.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,8 @@
D730266C244F639200A6C002 /* cal3d.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = cal3d.framework; path = "$(USER_LIBRARY_DIR)/Frameworks/cal3d.framework"; sourceTree = "<group>"; };
D730266D244F639300A6C002 /* libpng.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libpng.framework; path = "$(USER_LIBRARY_DIR)/Frameworks/libpng.framework"; sourceTree = "<group>"; };
D730266E244F639300A6C002 /* SDL2_image.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2_image.framework; path = "$(USER_LIBRARY_DIR)/Frameworks/SDL2_image.framework"; sourceTree = "<group>"; };
D73C7C762CCD8D740054FD88 /* json.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = json.hpp; sourceTree = "<group>"; };
D73C7C772CCD8D740054FD88 /* json_fwd.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = json_fwd.hpp; sourceTree = "<group>"; };
D7436E7B2459829500875ABE /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = "Eternal Lands/Images.xcassets"; sourceTree = "<group>"; };
D7437F0C245AB82B00875ABE /* Vorbis.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Vorbis.framework; path = "$(USER_LIBRARY_DIR)/Frameworks/Vorbis.framework"; sourceTree = "<group>"; };
D7437F0F245ABAD100875ABE /* vorbis.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = vorbis.framework; path = "$(USER_LIBRARY_DIR)/Frameworks/vorbis.framework"; sourceTree = "<group>"; };
Expand All @@ -696,7 +698,6 @@
D791C72025F9327D00EB3011 /* password_manager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = password_manager.h; path = ../password_manager.h; sourceTree = "<group>"; };
D791C72125F932ED00EB3011 /* trade_log.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = trade_log.h; path = ../trade_log.h; sourceTree = "<group>"; };
D791C72225F9336F00EB3011 /* SDL2_ttf.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2_ttf.framework; path = "$(USER_LIBRARY_DIR)/Frameworks/SDL2_ttf.framework"; sourceTree = "<group>"; };
D791C74425F938F400EB3011 /* json.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = json.hpp; sourceTree = "<group>"; };
D7A6536E2B861224003E0B91 /* actors_list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = actors_list.h; path = ../actors_list.h; sourceTree = "<group>"; };
D7A6536F2B861224003E0B91 /* actors_list.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = actors_list.cpp; path = ../actors_list.cpp; sourceTree = "<group>"; };
D7A653712B86123F003E0B91 /* invasion_window.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = invasion_window.cpp; path = ../invasion_window.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1405,29 +1406,30 @@
name = Frameworks;
sourceTree = "<group>";
};
D791C73A25F938F300EB3011 /* nlohmann_json */ = {
D73C7C782CCD8D740054FD88 /* nlohmann */ = {
isa = PBXGroup;
children = (
D791C74225F938F400EB3011 /* single_include */,
D73C7C762CCD8D740054FD88 /* json.hpp */,
D73C7C772CCD8D740054FD88 /* json_fwd.hpp */,
);
name = nlohmann_json;
path = ../nlohmann_json;
path = nlohmann;
sourceTree = "<group>";
};
D791C74225F938F400EB3011 /* single_include */ = {
D73C7C792CCD8D740054FD88 /* include */ = {
isa = PBXGroup;
children = (
D791C74325F938F400EB3011 /* nlohmann */,
D73C7C782CCD8D740054FD88 /* nlohmann */,
);
path = single_include;
path = include;
sourceTree = "<group>";
};
D791C74325F938F400EB3011 /* nlohmann */ = {
D791C73A25F938F300EB3011 /* nlohmann_json */ = {
isa = PBXGroup;
children = (
D791C74425F938F400EB3011 /* json.hpp */,
D73C7C792CCD8D740054FD88 /* include */,
);
path = nlohmann;
name = nlohmann_json;
path = ../nlohmann_json;
sourceTree = "<group>";
};
/* End PBXGroup section */
Expand Down Expand Up @@ -1777,7 +1779,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1.9.6p1;
CURRENT_PROJECT_VERSION = 1.9.7;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = (
"$(USER_LIBRARY_DIR)/Frameworks",
Expand Down Expand Up @@ -1812,7 +1814,7 @@
"$(SRCROOT)/../nlohmann_json/include/",
"$(SRCROOT)/include/",
);
MARKETING_VERSION = 1.9.6p1;
MARKETING_VERSION = 1.9.7;
OTHER_CFLAGS = (
"-Wno-deprecated-declarations",
"-Wno-pointer-sign",
Expand Down Expand Up @@ -1840,7 +1842,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1.9.6p1;
CURRENT_PROJECT_VERSION = 1.9.7;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = (
"$(USER_LIBRARY_DIR)/Frameworks",
Expand Down Expand Up @@ -1874,7 +1876,7 @@
"$(SRCROOT)/../nlohmann_json/include/",
"$(SRCROOT)/include/",
);
MARKETING_VERSION = 1.9.6p1;
MARKETING_VERSION = 1.9.7;
OTHER_CFLAGS = (
"-Wno-deprecated-declarations",
"-Wno-pointer-sign",
Expand Down

0 comments on commit c1c2c54

Please sign in to comment.