Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build errors in SuperSlicer #5

Merged
merged 1 commit into from
Nov 16, 2024
Merged

Fix build errors in SuperSlicer #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/ccpp_ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
cmake-version: '3.16.x'
- name: update submodule profiles
working-directory: ./resources/profiles
run: git submodule update --init
run: git submodule update --init --recursive
- name: change date in version
run: sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc
- name: update clock
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/ccpp_win_debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: ilammy/msvc-dev-cmd@v1
- name: update submodule profiles
working-directory: ./resources/profiles
run: git submodule update --init
run: git submodule update --init --recursive
- run: mkdir deps/destdir
- name: copy deps
working-directory: ./deps/destdir
Expand Down Expand Up @@ -83,10 +83,12 @@ jobs:
- uses: ilammy/msvc-dev-cmd@v1
- name: update submodule profiles
working-directory: ./resources/profiles
run: git submodule update --init
run: git submodule update --init --recursive
- name: change date in version
shell: powershell
run: (Get-Content version.inc) | Foreach-Object {$_ -replace "\+UNKNOWN", ("_" + [datetime]::Today.ToString("yyyy-MM-dd"))} | Set-Content version.inc
run: if (Test-Path version.inc) {
(Get-Content version.inc) -replace '\+UNKNOWN', "_$(Get-Date -Format yyyy-MM-dd)" | Set-Content version.inc
}
- name: mkdir in deps directory
run: mkdir deps/destdir
- name: download deps
Expand Down
3 changes: 3 additions & 0 deletions src/angelscript/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ if(MSVC AND CMAKE_CL_64)
enable_language(ASM_MASM)
if(CMAKE_ASM_MASM_COMPILER_WORKS)
set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} source/as_callfunc_x64_msvc_asm.asm)
set_source_files_properties(source/as_callfunc_x64_msvc_asm.asm PROPERTIES COMPILE_FLAGS "")
else()
message(FATAL ERROR "MSVC x86_64 target requires a working assembler")
endif()
Expand All @@ -132,6 +133,7 @@ elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^aarch64")
enable_language(ASM)
if(CMAKE_ASM_COMPILER_WORKS)
set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} source/as_callfunc_arm64.cpp source/as_callfunc_arm64_gcc.S)
set_source_files_properties(source/as_callfunc_arm64_gcc.S PROPERTIES COMPILE_FLAGS "")
#set_property(SOURCE source/as_callfunc_arm64_gcc.S APPEND PROPERTY COMPILE_FLAGS " -Wa")
else()
message(FATAL ERROR "ARM target requires a working assembler")
Expand All @@ -140,6 +142,7 @@ elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
enable_language(ASM)
if(CMAKE_ASM_COMPILER_WORKS)
set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} source/as_callfunc_arm.cpp source/as_callfunc_arm_gcc.S)
set_source_files_properties(source/as_callfunc_arm_gcc.S PROPERTIES COMPILE_FLAGS "")
set_property(SOURCE source/as_callfunc_arm_gcc.S APPEND PROPERTY COMPILE_FLAGS " -Wa,-mimplicit-it=always")
else()
message(FATAL ERROR "ARM target requires a working assembler")
Expand Down