Skip to content

Commit

Permalink
Fixes for XCode build (continuing saga) (#2098)
Browse files Browse the repository at this point in the history 
* Fixes for XCode build (continuing saga)

* Revert WHITSPACE removed - to original

* Silence PATCH warnings
  • Loading branch information
@FitzerIRL @mfiess
FitzerIRL authored and mfiess committed Oct 31, 2019
1 parent 00deb0d commit 403b0fa
Show file tree
Hide file tree
Showing 7 changed files with 62 additions and 6 deletions.
13 changes: 13 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,3 +198,16 @@ examples/pxScene2d/external/zlib-1.2.11/minigzip
examples/pxScene2d/external/zlib-1.2.11/minigzipsh
examples/pxScene2d/external/zlib-1.2.11/zconf.h
examples/pxScene2d/external/extlibs

examples/pxScene2d/external/glib/***
examples/pxScene2d/external/gettext/***

examples/pxScene2d/external/libnode-v10.15.3/

examples/pxScene2d/external/icu/***

examples/pxScene2d/external/libffi/***

examples/pxScene2d/external/openssl-1.0.2o/***

examples/pxScene2d/external/pcre/***
11 changes: 11 additions & 0 deletions examples/pxScene2d/external/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,17 @@ sqlite-autoconf-3280000/Makefile.in
sqlite-autoconf-3280000/missing
sqlite-autoconf-3280000/sqlite3

gettext/*
glib/*
libnode-v10.15.3/*
openssl-1.0.2o/*
uWebSockets-0.14.8/*
libpng-1.6.28/*
libpng-1.6.28/libpng-config
./node

nanosvg/PATCHED

sqlite-autoconf-3280000/*.cache

uWebSockets-0.14.8/Makefile
Expand Down
35 changes: 32 additions & 3 deletions examples/pxScene2d/external/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,8 +393,8 @@ then

if [ -e "node-v${NODE_VER}_mods.patch" ]
then
git apply "node-v${NODE_VER}_mods.patch"
git apply "openssl_1.0.2_compatibility.patch"
git apply --whitespace=nowarn "node-v${NODE_VER}_mods.patch"
git apply --whitespace=nowarn "openssl_1.0.2_compatibility.patch"
fi

cd "libnode-v${NODE_VER}"
Expand All @@ -411,9 +411,38 @@ then
ln -sf libnode.*.dylib libnode.dylib
fi

git update-index --assume-unchanged common.gypi # ... help GIT out
git update-index --assume-unchanged configure.py # ... help GIT out
git update-index --assume-unchanged deps/http_parser/http_parser.gyp # ... help GIT out
git update-index --assume-unchanged deps/uv/common.gypi # ... help GIT out
git update-index --assume-unchanged deps/uv/src/unix/core.c # ... help GIT out
git update-index --assume-unchanged deps/v8/BUILD.gn # ... help GIT out
git update-index --assume-unchanged deps/v8/gypfiles/toolchain.gypi # ... help GIT out
git update-index --assume-unchanged deps/v8/gypfiles/v8.gyp # ... help GIT out
git update-index --assume-unchanged deps/v8/src/isolate.cc # ... help GIT out
git update-index --assume-unchanged lib/internal/bootstrap/node.js # ... help GIT out
git update-index --assume-unchanged lib/internal/vm/source_text_module.js # ... help GIT out
git update-index --assume-unchanged lib/net.js # ... help GIT out
git update-index --assume-unchanged node.gyp # ... help GIT out
git update-index --assume-unchanged src/env-inl.h # ... help GIT out
git update-index --assume-unchanged src/module_wrap.cc # ... help GIT out
git update-index --assume-unchanged src/module_wrap.h # ... help GIT out
git update-index --assume-unchanged src/node.cc # ... help GIT out
git update-index --assume-unchanged src/node.h # ... help GIT out
git update-index --assume-unchanged src/node_contextify.cc # ... help GIT out
git update-index --assume-unchanged src/node_crypto.cc # ... help GIT out
git update-index --assume-unchanged src/node_crypto.h # ... help GIT out
git update-index --assume-unchanged src/node_http_parser.cc # ... help GIT out
git update-index --assume-unchanged src/node_internals.h # ... help GIT out
git update-index --assume-unchanged src/node_platform.cc # ... help GIT out
git update-index --assume-unchanged src/node_watchdog.cc # ... help GIT out
git update-index --assume-unchanged vcbuild.bat # ... help GIT out

cd ..
rm node
ln -sf "libnode-v${NODE_VER}" node

git update-index --assume-unchanged node # ... help GIT out
fi
#---------

Expand All @@ -431,7 +460,7 @@ then
cp Makefile.build Makefile
fi

CPPFLAGS="-I${OPENSSL_DIR} -I${OPENSSL_DIR}/include" LDFLAGS="-L${OPENSSL_DIR}/lib -Wl,-rpath,${OPENSSL_DIR}/lib " make
CPPFLAGS="${IDE_SEARCH_PATH} -I${OPENSSL_DIR} -I${OPENSSL_DIR}/include" LDFLAGS="-L${OPENSSL_DIR}/lib -Wl,-rpath,${OPENSSL_DIR}/lib " make
cd ..

fi
Expand Down
2 changes: 2 additions & 0 deletions examples/pxScene2d/external/nanosvg/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,6 @@ pushd $DIRECTORY
else
quilt push -aq || test $? = 2
fi

touch PATCHED
popd
1 change: 1 addition & 0 deletions examples/pxScene2d/external/openssl_dir
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
openssl-1.0.2o
4 changes: 2 additions & 2 deletions examples/pxScene2d/pxScene2d_xcode/getLocalLibs.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ if [ ! -d ${xLIBS} ]; then

cp ${xEXT}/node/libnode.64.dylib ${xLIBS}

cp ${xEXT}/openssl/libcrypto.dylib ${xLIBS}
cp ${xEXT}/openssl/libssl.dylib ${xLIBS}
cp ${xEXT}/openssl_dir/libcrypto.dylib ${xLIBS}
cp ${xEXT}/openssl_dir/libssl.dylib ${xLIBS}

### OLDER PNG
##
Expand Down
2 changes: 1 addition & 1 deletion pxCore.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1145,7 +1145,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cd $PROJECT_DIR/examples/pxScene2d/external\npwd\n./build.sh\n";
shellScript = "cd $PROJECT_DIR/examples/pxScene2d/external\npwd\nexport IDE_SEARCH_PATH=-I/usr/local/include\n/bin/bash ./build.sh # 2>&1 | tee > output.txt\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down

0 comments on commit 403b0fa

Please sign in to comment.