Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions .github/workflows/build-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,48 @@ jobs:
startup.lua
Editor_MacOS

ios:
runs-on: macos-latest
steps:
- uses: actions/checkout@v4

- name: Compile Offlineshadercompiler
run: |
xcodebuild clean build \
-project WickedEngine/offlineshadercompiler.xcodeproj \
-scheme offlineshadercompiler \
-configuration Release

- name: Generate shader dump
run: |
BUILD_PATH="$(xcodebuild -project WickedEngine/offlineshadercompiler.xcodeproj -scheme offlineshadercompiler -configuration Release -showBuildSettings | grep -m 1 "BUILT_PRODUCTS_DIR" | awk -F' = ' '{print $2}')"
cd WickedEngine
"${BUILD_PATH}/offlineshadercompiler" metal rebuild shaderdump
cd ..

- name: Build Editor_iOS
run: |
xcodebuild clean build \
-project Editor/Editor.xcodeproj \
-scheme Editor_iOS \
-configuration Release \
-sdk iphoneos \
CODE_SIGNING_ALLOWED=NO \
CODE_SIGNING_REQUIRED=NO

- name: Move files
run: |
BUILD_PATH="$(xcodebuild -project Editor/Editor.xcodeproj -scheme Editor_iOS -configuration Release -sdk iphoneos -showBuildSettings | grep -m 1 "BUILT_PRODUCTS_DIR" | awk -F' = ' '{print $2}')"

mv "${BUILD_PATH}/Editor_iOS.app" ./Editor_iOS.app

- name: Package Editor
uses: actions/upload-artifact@v4
with:
name: Editor (iOS)
path: |
Editor_iOS.app

content:
runs-on: windows-latest
steps:
Expand Down
42 changes: 42 additions & 0 deletions .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,48 @@ jobs:
startup.lua
Editor_MacOS

ios:
runs-on: macos-latest
steps:
- uses: actions/checkout@v4

- name: Compile Offlineshadercompiler
run: |
xcodebuild clean build \
-project WickedEngine/offlineshadercompiler.xcodeproj \
-scheme offlineshadercompiler \
-configuration Release

- name: Generate shader dump
run: |
BUILD_PATH="$(xcodebuild -project WickedEngine/offlineshadercompiler.xcodeproj -scheme offlineshadercompiler -configuration Release -showBuildSettings | grep -m 1 "BUILT_PRODUCTS_DIR" | awk -F' = ' '{print $2}')"
cd WickedEngine
"${BUILD_PATH}/offlineshadercompiler" metal rebuild shaderdump
cd ..

- name: Build Editor_iOS
run: |
xcodebuild clean build \
-project Editor/Editor.xcodeproj \
-scheme Editor_iOS \
-configuration Release \
-sdk iphoneos \
CODE_SIGNING_ALLOWED=NO \
CODE_SIGNING_REQUIRED=NO

- name: Move files
run: |
BUILD_PATH="$(xcodebuild -project Editor/Editor.xcodeproj -scheme Editor_iOS -configuration Release -sdk iphoneos -showBuildSettings | grep -m 1 "BUILT_PRODUCTS_DIR" | awk -F' = ' '{print $2}')"

mv "${BUILD_PATH}/Editor_iOS.app" ./Editor_iOS.app

- name: Package Editor
uses: actions/upload-artifact@v4
with:
name: Editor (iOS)
path: |
Editor_iOS.app


content:
runs-on: windows-latest
Expand Down
42 changes: 42 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,48 @@ jobs:
startup.lua
Editor_MacOS

ios:
runs-on: macos-latest
steps:
- uses: actions/checkout@v4

- name: Compile Offlineshadercompiler
run: |
xcodebuild clean build \
-project WickedEngine/offlineshadercompiler.xcodeproj \
-scheme offlineshadercompiler \
-configuration Release

- name: Generate shader dump
run: |
BUILD_PATH="$(xcodebuild -project WickedEngine/offlineshadercompiler.xcodeproj -scheme offlineshadercompiler -configuration Release -showBuildSettings | grep -m 1 "BUILT_PRODUCTS_DIR" | awk -F' = ' '{print $2}')"
cd WickedEngine
"${BUILD_PATH}/offlineshadercompiler" metal rebuild shaderdump
cd ..

- name: Build Editor_iOS
run: |
xcodebuild clean build \
-project Editor/Editor.xcodeproj \
-scheme Editor_iOS \
-configuration Release \
-sdk iphoneos \
CODE_SIGNING_ALLOWED=NO \
CODE_SIGNING_REQUIRED=NO

- name: Move files
run: |
BUILD_PATH="$(xcodebuild -project Editor/Editor.xcodeproj -scheme Editor_iOS -configuration Release -sdk iphoneos -showBuildSettings | grep -m 1 "BUILT_PRODUCTS_DIR" | awk -F' = ' '{print $2}')"

mv "${BUILD_PATH}/Editor_iOS.app" ./Editor_iOS.app

- name: Package Editor
uses: actions/upload-artifact@v4
with:
name: Editor (iOS)
path: |
Editor_iOS.app

content:
runs-on: windows-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion Editor/ContentBrowserWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ void ContentBrowserWindow::RefreshContent()
{
content_folder = wi::helper::GetCurrentPath() + "/Content/";
wi::helper::MakePathAbsolute(content_folder);
if (!wi::helper::FileExists(content_folder))
if (!wi::helper::DirectoryExists(content_folder))
{
content_folder = wi::helper::GetCurrentPath() + "/../Content/";
wi::helper::MakePathAbsolute(content_folder);
Expand Down
5 changes: 5 additions & 0 deletions Editor/Editor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6856,6 +6856,11 @@ bool EditorComponent::CheckUnsavedChanges(int scene_index)
// User doesn't want to save, proceed
return true;
}
else if (result == wi::helper::MessageBoxResult::OK)
{
// IOS default OK return since we don't have messagebox yet
return true;
}
else // Cancel or closed dialog
{
// User cancelled, don't proceed
Expand Down
Loading
Loading