Skip to content

I
Irrlicht New
Commit 0b7ca349 authored by wind2009's avatar wind2009
Browse files
Options

checkout FETCH_HEAD include source

parent 262a1f71
Pipeline #35896 canceled with stages
      in 1 minute and 4 seconds
      Show whitespace changes
      Inline Side-by-side
      Showing with 14 additions and 14 deletions
      source/Irrlicht/MacOSX/MacOSX.xcodeproj/project.pbxproj
      View file @ 0b7ca349
      ...@@ -5669,7 +5669,7 @@ ...@@ -5669,7 +5669,7 @@
      0946CCB20EC99BBE00D945A5 /* Debug */ = { 0946CCB20EC99BBE00D945A5 /* Debug */ = {
      isa = XCBuildConfiguration; isa = XCBuildConfiguration;
      buildSettings = { buildSettings = {
      ARCHS = "x86_64 arm64"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
      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 = "x86_64 arm64"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
      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 = "x86_64 arm64"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
      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 = "x86_64 arm64"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
      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 = "x86_64 arm64"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
      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 = "x86_64 arm64"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
      COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
      DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
      DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
      ...@@ -6620,7 +6620,7 @@ ...@@ -6620,7 +6620,7 @@
      B81CFF3F097FE25F0057C06F /* Debug */ = { B81CFF3F097FE25F0057C06F /* Debug */ = {
      isa = XCBuildConfiguration; isa = XCBuildConfiguration;
      buildSettings = { buildSettings = {
      ARCHS = "x86_64 arm64"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
      COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
      DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
      DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
      ...@@ -6655,7 +6655,7 @@ ...@@ -6655,7 +6655,7 @@
      B81CFF40097FE25F0057C06F /* Release */ = { B81CFF40097FE25F0057C06F /* Release */ = {
      isa = XCBuildConfiguration; isa = XCBuildConfiguration;
      buildSettings = { buildSettings = {
      ARCHS = "x86_64 arm64"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
      COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
      DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
      DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
      ...@@ -6752,7 +6752,7 @@ ...@@ -6752,7 +6752,7 @@
      B81CFF84097FE3DC0057C06F /* Debug */ = { B81CFF84097FE3DC0057C06F /* Debug */ = {
      isa = XCBuildConfiguration; isa = XCBuildConfiguration;
      buildSettings = { buildSettings = {
      ARCHS = "x86_64 arm64"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
      COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
      DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
      DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
      ...@@ -6781,7 +6781,7 @@ ...@@ -6781,7 +6781,7 @@
      B81CFF85097FE3DC0057C06F /* Release */ = { B81CFF85097FE3DC0057C06F /* Release */ = {
      isa = XCBuildConfiguration; isa = XCBuildConfiguration;
      buildSettings = { buildSettings = {
      ARCHS = "x86_64 arm64"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
      COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
      DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
      DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
      ...@@ -6813,7 +6813,7 @@ ...@@ -6813,7 +6813,7 @@
      B81CFF9D097FE45E0057C06F /* Debug */ = { B81CFF9D097FE45E0057C06F /* Debug */ = {
      isa = XCBuildConfiguration; isa = XCBuildConfiguration;
      buildSettings = { buildSettings = {
      ARCHS = "x86_64 arm64"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
      COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
      DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
      DSTROOT = ../../../bin/MacOSX; DSTROOT = ../../../bin/MacOSX;
      ...@@ -6843,7 +6843,7 @@ ...@@ -6843,7 +6843,7 @@
      B81CFF9E097FE45E0057C06F /* Release */ = { B81CFF9E097FE45E0057C06F /* Release */ = {
      isa = XCBuildConfiguration; isa = XCBuildConfiguration;
      buildSettings = { buildSettings = {
      ARCHS = "x86_64 arm64"; ARCHS = "$(NATIVE_ARCH_ACTUAL)";
      COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
      DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
      DEPLOYMENT_LOCATION = YES; DEPLOYMENT_LOCATION = YES;
      ......
      source/Irrlicht/libpng/pngpriv.h
      View file @ 0b7ca349
      ...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
      * associated assembler code, pass --enable-arm-neon=no to configure * associated assembler code, pass --enable-arm-neon=no to configure
      * or put -DPNG_ARM_NEON_OPT=0 in CPPFLAGS. * or put -DPNG_ARM_NEON_OPT=0 in CPPFLAGS.
      */ */
      # if defined(PNG_ARM_NEON) && (defined(ARM_NEON) || defined(__ARM_NEON)) && \ # if (defined(__ARM_NEON__) || defined(__ARM_NEON)) && \
      defined(PNG_ALIGNED_MEMORY_SUPPORTED) defined(PNG_ALIGNED_MEMORY_SUPPORTED)
      # define PNG_ARM_NEON_OPT 2 # define PNG_ARM_NEON_OPT 2
      # else # else
      ...@@ -990,7 +990,7 @@ ...@@ -990,7 +990,7 @@
      /* Validate the include paths - the include path used to generate pnglibconf.h /* Validate the include paths - the include path used to generate pnglibconf.h
      * must match that used in the build, or we must be using pnglibconf.h.prebuilt: * must match that used in the build, or we must be using pnglibconf.h.prebuilt:
      */ */
      #if 1 == 2 #if PNG_ZLIB_VERNUM != 0 && PNG_ZLIB_VERNUM != ZLIB_VERNUM
      # error ZLIB_VERNUM != PNG_ZLIB_VERNUM \ # error ZLIB_VERNUM != PNG_ZLIB_VERNUM \
      "-I (include path) error: see the notes in pngpriv.h" "-I (include path) error: see the notes in pngpriv.h"
      /* This means that when pnglibconf.h was built the copy of zlib.h that it /* This means that when pnglibconf.h was built the copy of zlib.h that it
      ......
      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