From 1b5958f6ff28d86703662b92a43e1afb21c31a4d Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Thu, 23 Jan 2025 15:33:17 +0000 Subject: [PATCH] Remove CPP_LIBPREFIX from ios/tvos template It is no longer used, and was only there to provide compatibility with hxcpp versions older than 3.2 --- tools/platforms/IOSPlatform.hx | 17 ----------------- tools/platforms/TVOSPlatform.hx | 17 ----------------- 2 files changed, 34 deletions(-) diff --git a/tools/platforms/IOSPlatform.hx b/tools/platforms/IOSPlatform.hx index bc4c31095..94bc43f6f 100644 --- a/tools/platforms/IOSPlatform.hx +++ b/tools/platforms/IOSPlatform.hx @@ -331,23 +331,6 @@ class IOSPlatform extends PlatformTarget context.IOS_COMPILER = project.config.getString("ios.compiler", "clang"); context.CPP_BUILD_LIBRARY = project.config.getString("cpp.buildLibrary", "hxcpp"); - var json = Json.parse(File.getContent(Haxelib.getPath(new Haxelib("hxcpp"), true) + "/haxelib.json")); - - var version = Std.string(json.version); - var versionSplit = version.split("."); - - while (versionSplit.length > 2) - versionSplit.pop(); - - if (Std.parseFloat(versionSplit.join(".")) > 3.1) - { - context.CPP_LIBPREFIX = "lib"; - } - else - { - context.CPP_LIBPREFIX = ""; - } - context.IOS_LINKER_FLAGS = ["-stdlib=libc++"].concat(project.config.getArrayString("ios.linker-flags")); context.IOS_NON_EXEMPT_ENCRYPTION = project.config.getBool("ios.non-exempt-encryption", false); diff --git a/tools/platforms/TVOSPlatform.hx b/tools/platforms/TVOSPlatform.hx index 76714971c..567750639 100644 --- a/tools/platforms/TVOSPlatform.hx +++ b/tools/platforms/TVOSPlatform.hx @@ -262,23 +262,6 @@ class TVOSPlatform extends PlatformTarget context.IOS_COMPILER = project.config.getString("tvos.compiler", "clang"); context.CPP_BUILD_LIBRARY = project.config.getString("cpp.buildLibrary", "hxcpp"); - var json = Json.parse(File.getContent(Haxelib.getPath(new Haxelib("hxcpp"), true) + "/haxelib.json")); - - var version = Std.string(json.version); - var versionSplit = version.split("."); - - while (versionSplit.length > 2) - versionSplit.pop(); - - if (Std.parseFloat(versionSplit.join(".")) > 3.1) - { - context.CPP_LIBPREFIX = "lib"; - } - else - { - context.CPP_LIBPREFIX = ""; - } - context.IOS_LINKER_FLAGS = ["-stdlib=libc++"].concat(project.config.getArrayString("tvos.linker-flags")); context.IOS_NON_EXEMPT_ENCRYPTION = project.config.getBool("tvos.non-exempt-encryption", true);