From 2132fb8345ed889a66b047df8a9bcc013d459791 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 15 Aug 2020 15:03:16 +0200 Subject: [PATCH] Rename Kromx to armorcore for more clarity --- .github/workflows/linux.yml | 2 +- .github/workflows/windowsbuild.yml | 12 ++++---- Libraries/syslib/README.md | 2 +- README.md | 44 +++++++++++++++--------------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index b89f3879..c0e02acc 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -14,4 +14,4 @@ jobs: - name: Get Node.js run: git clone https://github.com/Kode/nodejs_bin.git --depth 1 - name: Compile - run: nodejs_bin/node-linux64 Kromx/make.js -g opengl + run: nodejs_bin/node-linux64 armorcore/make.js -g opengl diff --git a/.github/workflows/windowsbuild.yml b/.github/workflows/windowsbuild.yml index 7fedec7a..10336e1e 100644 --- a/.github/workflows/windowsbuild.yml +++ b/.github/workflows/windowsbuild.yml @@ -12,7 +12,7 @@ jobs: build: runs-on: windows-latest - + steps: - uses: actions/checkout@v1 - name: Get Submodules @@ -21,12 +21,12 @@ jobs: uses: actions/setup-node@v1.4.2 - name: install msbuild uses: microsoft/setup-msbuild@v1 - - name: kromx - run: node Kromx/make -g direct3d11 + - name: armorcore + run: node armorcore/make -g direct3d11 - name: Unpack v8_monolith uses: DuckSoft/extract-7z-action@v1.0 with: - pathSource: Kromx/v8/libraries/win32/release/v8_monolith.7z - pathTarget: Kromx/v8/libraries/win32/release/ + pathSource: armorcore/v8/libraries/win32/release/v8_monolith.7z + pathTarget: armorcore/v8/libraries/win32/release/ - name: Kinc and compile - run: cd Kromx;node Kinc/make -g direct3d11 --compile + run: cd armorcore;node Kinc/make -g direct3d11 --compile diff --git a/Libraries/syslib/README.md b/Libraries/syslib/README.md index 96f65836..5a729b78 100644 --- a/Libraries/syslib/README.md +++ b/Libraries/syslib/README.md @@ -1,3 +1,3 @@ # syslib -System library for Kromx. +System library for armorcore. diff --git a/README.md b/README.md index 2414cefb..3580b2d7 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ cd armorpaint ``` ```bash # Windows -node Kromx/make -g direct3d11 -cd Kromx +node armorcore/make -g direct3d11 +cd armorcore # Unpack `v8\libraries\win32\release\v8_monolith.7z` using 7-Zip - Extract Here (exceeds 100MB) git apply patch/window_handling.diff --directory=Kinc node Kinc/make -g direct3d11 @@ -25,8 +25,8 @@ node Kinc/make -g direct3d11 ``` ```bash # Linux -node Kromx/make -g opengl -cd Kromx +node armorcore/make -g opengl +cd armorcore node Kinc/make -g opengl --compiler clang --compile cd Deployment strip Krom @@ -34,42 +34,42 @@ strip Krom ``` ```bash # macOS -node Kromx/make -g metal -cp -a build/krom/ Kromx/Deployment -cd Kromx +node armorcore/make -g metal +cp -a build/krom/ armorcore/Deployment +cd armorcore git apply patch/metal_shared_sampler.diff --directory=Kinc node Kinc/make -g metal # Open generated Xcode project -# Add `path/to/armorpaint/Kromx/v8/libraries/macos/release` into `Project - Krom - Build Settings - Search Paths - Library Search Paths` +# Add `path/to/armorpaint/armorcore/v8/libraries/macos/release` into `Project - Krom - Build Settings - Search Paths - Library Search Paths` # Build ``` ```bash # Android - wip -node Kromx/make android -g opengl --shaderversion 300 -cp -r build/krom/ Kromx/build/Krom/app/src/main/assets/ -cd Kromx +node armorcore/make android -g opengl --shaderversion 300 +cp -r build/krom/ armorcore/build/Krom/app/src/main/assets/ +cd armorcore node Kinc/make android -g opengl # Manual tweaking is required for now: -# https://github.com/armory3d/Kromx/blob/master/kincfile.js#L68 +# https://github.com/armory3d/armorcore/blob/master/kincfile.js#L68 # Open generated Android Studio project # Build for device ``` ```bash # iOS - wip -node Kromx/make ios -g metal -cp -a build/krom/ Kromx/Deployment -cd Kromx +node armorcore/make ios -g metal +cp -a build/krom/ armorcore/Deployment +cd armorcore git apply patch/metal_shared_sampler.diff --directory=Kinc git apply patch/ios_document_picker.diff --directory=Kinc node Kinc/make ios -g metal # Open generated Xcode project -# Add `path/to/Kromx/v8/libraries/ios/release` into `Project - Krom - Build Settings - Search Paths - Library Search Paths` +# Add `path/to/armorcore/v8/libraries/ios/release` into `Project - Krom - Build Settings - Search Paths - Library Search Paths` # Build for device ``` ```bash # Windows DXR - wip -node Kromx/make -g direct3d12 -cd Kromx +node armorcore/make -g direct3d12 +cd armorcore # Unpack `v8\libraries\win32\release\v8_monolith.7z` using 7-Zip - Extract Here (exceeds 100MB) git apply patch/window_handling.diff --directory=Kinc git apply patch/d3d12_raytrace.diff --directory=Kinc @@ -81,8 +81,8 @@ node Kinc/make -g direct3d12 --raytrace dxr ``` ```bash # Linux VKRT - wip -node Kromx/make -g vulkan -cd Kromx +node armorcore/make -g vulkan +cd armorcore git apply patch/vulkan_raytrace.diff --directory=Kinc node Kinc/make -g vulkan --raytrace vkrt --compiler clang --compile cd Deployment @@ -91,8 +91,8 @@ strip Krom ``` ```bash # Windows VR - wip -node Kromx/make -g direct3d11 --vr oculus -cd Kromx +node armorcore/make -g direct3d11 --vr oculus +cd armorcore # Unpack `v8\libraries\win32\release\v8_monolith.7z` using 7-Zip - Extract Here (exceeds 100MB) git apply patch/window_handling.diff --directory=Kinc node Kinc/make -g direct3d11 --vr oculus