Skip to content

Commit 486f4df

Browse files
justin-espedaljustin-espedal
committed
Update library paths to differentiate simulators
1 parent 635d458 commit 486f4df

4 files changed

Lines changed: 28 additions & 18 deletions

File tree

‎templates/ios/template/{{app.file}}.xcodeproj/project.pbxproj‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@
7979
isa = PBXFrameworksBuildPhase;
8080
buildActionMask = 2147483647;
8181
files = (
82-
::if ARMV6::1EF0A888121AE2F0003F2F59 /* lib/ApplicationMain.a in lib */,::end::
83-
::if ARMV7::1EF0A888121AE2F0003F2F5A /* lib/ApplicationMain-v7.a in lib */,::end::
8482
792E75C91C6C876900D01DE0 /* GameController.framework in Frameworks */,
8583
792E75C91C6C876900D01DE1 /* CoreText.framework in Frameworks */,
8684
7C1D3D2F27403D7800CFEBE5 /* CoreHaptics.framework in Frameworks */,
@@ -415,7 +413,12 @@
415413
GCC_PREFIX_HEADER = "::APP_FILE::/::APP_FILE::-Prefix.pch";
416414
INFOPLIST_FILE = "::APP_FILE::/::APP_FILE::-Info.plist";
417415
IPHONEOS_DEPLOYMENT_TARGET = ::DEPLOYMENT::;
418-
"LIBRARY_SEARCH_PATHS[arch=arm64]" = (
416+
"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*][arch=arm64]" = (
417+
"$(inherited)",
418+
"\"$(SRCROOT)/::APP_FILE::/lib/arm64-sim-debug\"",
419+
"\"$(SRCROOT)/::APP_FILE::/lib/arm64-sim\"",
420+
);
421+
"LIBRARY_SEARCH_PATHS[sdk=iphoneos*][arch=arm64]" = (
419422
"$(inherited)",
420423
"\"$(SRCROOT)/::APP_FILE::/lib/arm64-debug\"",
421424
"\"$(SRCROOT)/::APP_FILE::/lib/arm64\"",
@@ -432,13 +435,13 @@
432435
);
433436
"LIBRARY_SEARCH_PATHS[arch=i386]" = (
434437
"$(inherited)",
435-
"\"$(SRCROOT)/::APP_FILE::/lib/i386-debug\"",
436-
"\"$(SRCROOT)/::APP_FILE::/lib/i386\"",
438+
"\"$(SRCROOT)/::APP_FILE::/lib/i386-sim-debug\"",
439+
"\"$(SRCROOT)/::APP_FILE::/lib/i386-sim\"",
437440
);
438441
"LIBRARY_SEARCH_PATHS[arch=x86_64]" = (
439442
"$(inherited)",
440-
"\"$(SRCROOT)/::APP_FILE::/lib/x86_64-debug\"",
441-
"\"$(SRCROOT)/::APP_FILE::/lib/x86_64\"",
443+
"\"$(SRCROOT)/::APP_FILE::/lib/x86_64-sim-debug\"",
444+
"\"$(SRCROOT)/::APP_FILE::/lib/x86_64-sim\"",
442445
);
443446
OTHER_LDFLAGS = (
444447
::if HAS_COCOAPODS::"$(inherited)",::end::
@@ -475,7 +478,11 @@
475478
GCC_PREFIX_HEADER = "::APP_FILE::/::APP_FILE::-Prefix.pch";
476479
INFOPLIST_FILE = "::APP_FILE::/::APP_FILE::-Info.plist";
477480
IPHONEOS_DEPLOYMENT_TARGET = ::DEPLOYMENT::;
478-
"LIBRARY_SEARCH_PATHS[arch=arm64]" = (
481+
"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*][arch=arm64]" = (
482+
"$(inherited)",
483+
"\"$(SRCROOT)/::APP_FILE::/lib/arm64-sim\"",
484+
);
485+
"LIBRARY_SEARCH_PATHS[sdk=iphoneos*][arch=arm64]" = (
479486
"$(inherited)",
480487
"\"$(SRCROOT)/::APP_FILE::/lib/arm64\"",
481488
);
@@ -489,11 +496,11 @@
489496
);
490497
"LIBRARY_SEARCH_PATHS[arch=i386]" = (
491498
"$(inherited)",
492-
"\"$(SRCROOT)/::APP_FILE::/lib/i386\"",
499+
"\"$(SRCROOT)/::APP_FILE::/lib/i386-sim\"",
493500
);
494501
"LIBRARY_SEARCH_PATHS[arch=x86_64]" = (
495502
"$(inherited)",
496-
"\"$(SRCROOT)/::APP_FILE::/lib/x86_64\"",
503+
"\"$(SRCROOT)/::APP_FILE::/lib/x86_64-sim\"",
497504
);
498505
OTHER_LDFLAGS = (
499506
::if HAS_COCOAPODS::"$(inherited)",::end::

‎templates/ios/template/{{app.file}}/haxe/BuildHxcppMbedtls.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<include name="${HXCPP}/build-tool/BuildCommon.xml" unless="HAS_HXCPP_MBEDTLS_FILES" />
66
<include name="${HXCPP}/src/hx/libs/ssl/Build.xml" unless="HAS_HXCPP_MBEDTLS_FILES" />
77

8-
<target id="default" output="libmbedtls_hxcpp${DBG}" tool="linker" toolid="static_link">
8+
<target id="default" output="libmbedtls_hxcpp${LIBEXTRA}${DBG}" tool="linker" toolid="static_link">
99

1010
<files id="mbedtls" if="HAS_HXCPP_MBEDTLS_FILES" />
1111
<files id="hxcpp_ssl" unless="HAS_HXCPP_MBEDTLS_FILES" />

‎templates/ios/template/{{app.file}}/haxe/makefile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,17 @@ endif
2020
HAXE_OS := $(PLATFORM_NAME)
2121
BUILD_TYPE := device
2222
EXTRA_DEFINES :=
23+
SIMFLAG :=
2324
ifeq ("$(HAXE_OS)","iphonesimulator")
2425
HAXE_OS := iphonesim
2526
BUILD_TYPE := simulator
2627
EXTRA_DEFINES := -D simulator
28+
SIMFLAG := -sim
2729
endif
2830
CONFIG := $(CONFIG)-$(HAXE_OS)
2931

30-
LIB_DEST := $(DEBUG)/libApplicationMain.a
31-
LIB_MBEDTLS_DEST := $(DEBUG)/libmbedtls_hxcpp.a
32+
LIB_DEST := $(SIMFLAG)$(DEBUG)/libApplicationMain.a
33+
LIB_MBEDTLS_DEST := $(SIMFLAG)$(DEBUG)/libmbedtls_hxcpp.a
3234

3335
SIMULATOR_ARCH = i386 x86_64
3436

‎tools/platforms/IOSPlatform.hx‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -857,6 +857,7 @@ class IOSPlatform extends PlatformTarget
857857
if (arch == "x86_64" && !context.X86_64) continue;
858858

859859
var devicetype = project.targetFlags.exists("simulator") ? "iphonesim" : "iphoneos";
860+
var simflag = project.targetFlags.exists("simulator") ? "-sim" : "";
860861

861862
var libExt = [
862863
'.$devicetype-armv6.a',
@@ -867,17 +868,17 @@ class IOSPlatform extends PlatformTarget
867868
'.$devicetype-x86_64.a'
868869
][archID];
869870

870-
System.mkdir(projectDirectory + "/lib/" + arch);
871-
System.mkdir(projectDirectory + "/lib/" + arch + "-debug");
871+
System.mkdir(projectDirectory + "/lib/" + arch + simflag);
872+
System.mkdir(projectDirectory + "/lib/" + arch + simflag + "-debug");
872873

873874
for (ndll in project.ndlls)
874875
{
875876
// if (ndll.haxelib != null) {
876877

877878
var releaseLib = NDLL.getLibraryPath(ndll, "iPhone", "lib", libExt);
878879
var debugLib = NDLL.getLibraryPath(ndll, "iPhone", "lib", libExt, true);
879-
var releaseDest = projectDirectory + "/lib/" + arch + "/lib" + ndll.name + ".a";
880-
var debugDest = projectDirectory + "/lib/" + arch + "-debug/lib" + ndll.name + ".a";
880+
var releaseDest = projectDirectory + "/lib/" + arch + simflag + "/lib" + ndll.name + ".a";
881+
var debugDest = projectDirectory + "/lib/" + arch + simflag + "-debug/lib" + ndll.name + ".a";
881882

882883
if (!FileSystem.exists(releaseLib))
883884
{
@@ -910,7 +911,7 @@ class IOSPlatform extends PlatformTarget
910911
fileName = "lib" + fileName;
911912
}
912913

913-
copyIfNewer(dependency.path, projectDirectory + "/lib/" + arch + "/" + fileName);
914+
copyIfNewer(dependency.path, projectDirectory + "/lib/" + arch + simflag + "/" + fileName);
914915
}
915916
}
916917
}

0 commit comments

Comments
 (0)