Skip to content

D
deprecated-irrlicht-mac
Commit 0887158e authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'm1mac'

parents 87668286 0e727e9c
Pipeline #4133 passed with stages
        in 2 minutes and 58 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 14 additions and 14 deletions
        source/Irrlicht/MacOSX/MacOSX.xcodeproj/project.pbxproj
        View file @ 0887158e
        ...@@ -5669,7 +5669,7 @@ ...@@ -5669,7 +5669,7 @@
        0946CCB20EC99BBE00D945A5 /* Debug */ = { 0946CCB20EC99BBE00D945A5 /* Debug */ = {
        isa = XCBuildConfiguration; isa = XCBuildConfiguration;
        buildSettings = { buildSettings = {
        ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "x86_64 arm64";
        COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
        DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
        DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
        ...@@ -5698,7 +5698,7 @@ ...@@ -5698,7 +5698,7 @@
        0946CCB30EC99BBE00D945A5 /* Release */ = { 0946CCB30EC99BBE00D945A5 /* Release */ = {
        isa = XCBuildConfiguration; isa = XCBuildConfiguration;
        buildSettings = { buildSettings = {
        ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "x86_64 arm64";
        COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
        DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
        DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
        ...@@ -5937,7 +5937,7 @@ ...@@ -5937,7 +5937,7 @@
        0E2E3CFA1103E294002DE8D7 /* Debug */ = { 0E2E3CFA1103E294002DE8D7 /* Debug */ = {
        isa = XCBuildConfiguration; isa = XCBuildConfiguration;
        buildSettings = { buildSettings = {
        ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "x86_64 arm64";
        COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
        DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
        DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
        ...@@ -5966,7 +5966,7 @@ ...@@ -5966,7 +5966,7 @@
        0E2E3CFB1103E294002DE8D7 /* Release */ = { 0E2E3CFB1103E294002DE8D7 /* Release */ = {
        isa = XCBuildConfiguration; isa = XCBuildConfiguration;
        buildSettings = { buildSettings = {
        ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "x86_64 arm64";
        COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
        DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
        DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
        ...@@ -5998,7 +5998,7 @@ ...@@ -5998,7 +5998,7 @@
        0E2E3D3A1103E3F4002DE8D7 /* Debug */ = { 0E2E3D3A1103E3F4002DE8D7 /* Debug */ = {
        isa = XCBuildConfiguration; isa = XCBuildConfiguration;
        buildSettings = { buildSettings = {
        ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "x86_64 arm64";
        COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
        DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
        DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
        ...@@ -6027,7 +6027,7 @@ ...@@ -6027,7 +6027,7 @@
        0E2E3D3B1103E3F4002DE8D7 /* Release */ = { 0E2E3D3B1103E3F4002DE8D7 /* Release */ = {
        isa = XCBuildConfiguration; isa = XCBuildConfiguration;
        buildSettings = { buildSettings = {
        ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "x86_64 arm64";
        COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
        DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
        DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
        ...@@ -6088,7 +6088,7 @@ ...@@ -6088,7 +6088,7 @@
        1DEB922308733DC00010E9CD /* Debug */ = { 1DEB922308733DC00010E9CD /* Debug */ = {
        isa = XCBuildConfiguration; isa = XCBuildConfiguration;
        buildSettings = { buildSettings = {
        ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "x86_64 arm64";
        GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
        GCC_WARN_UNUSED_VARIABLE = NO; GCC_WARN_UNUSED_VARIABLE = NO;
        HEADER_SEARCH_PATHS = ../../../include; HEADER_SEARCH_PATHS = ../../../include;
        ...@@ -6104,7 +6104,7 @@ ...@@ -6104,7 +6104,7 @@
        1DEB922408733DC00010E9CD /* Release */ = { 1DEB922408733DC00010E9CD /* Release */ = {
        isa = XCBuildConfiguration; isa = XCBuildConfiguration;
        buildSettings = { buildSettings = {
        ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "x86_64 arm64";
        GCC_DYNAMIC_NO_PIC = YES; GCC_DYNAMIC_NO_PIC = YES;
        GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
        GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
        ...@@ -6614,7 +6614,7 @@ ...@@ -6614,7 +6614,7 @@
        B81CFF3F097FE25F0057C06F /* Debug */ = { B81CFF3F097FE25F0057C06F /* Debug */ = {
        isa = XCBuildConfiguration; isa = XCBuildConfiguration;
        buildSettings = { buildSettings = {
        ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "x86_64 arm64";
        COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
        DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
        DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
        ...@@ -6649,7 +6649,7 @@ ...@@ -6649,7 +6649,7 @@
        B81CFF40097FE25F0057C06F /* Release */ = { B81CFF40097FE25F0057C06F /* Release */ = {
        isa = XCBuildConfiguration; isa = XCBuildConfiguration;
        buildSettings = { buildSettings = {
        ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "x86_64 arm64";
        COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
        DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
        DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
        ...@@ -6746,7 +6746,7 @@ ...@@ -6746,7 +6746,7 @@
        B81CFF84097FE3DC0057C06F /* Debug */ = { B81CFF84097FE3DC0057C06F /* Debug */ = {
        isa = XCBuildConfiguration; isa = XCBuildConfiguration;
        buildSettings = { buildSettings = {
        ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "x86_64 arm64";
        COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
        DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
        DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
        ...@@ -6775,7 +6775,7 @@ ...@@ -6775,7 +6775,7 @@
        B81CFF85097FE3DC0057C06F /* Release */ = { B81CFF85097FE3DC0057C06F /* Release */ = {
        isa = XCBuildConfiguration; isa = XCBuildConfiguration;
        buildSettings = { buildSettings = {
        ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "x86_64 arm64";
        COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
        DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
        DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
        ...@@ -6807,7 +6807,7 @@ ...@@ -6807,7 +6807,7 @@
        B81CFF9D097FE45E0057C06F /* Debug */ = { B81CFF9D097FE45E0057C06F /* Debug */ = {
        isa = XCBuildConfiguration; isa = XCBuildConfiguration;
        buildSettings = { buildSettings = {
        ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "x86_64 arm64";
        COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
        DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
        DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
        ...@@ -6837,7 +6837,7 @@ ...@@ -6837,7 +6837,7 @@
        B81CFF9E097FE45E0057C06F /* Release */ = { B81CFF9E097FE45E0057C06F /* Release */ = {
        isa = XCBuildConfiguration; isa = XCBuildConfiguration;
        buildSettings = { buildSettings = {
        ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ARCHS = "x86_64 arm64";
        COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
        DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
        DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
        ......
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment