GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-14 08:45:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert and test

Browse Source
This commit is contained in:
SoftFever 2024-12-08 17:45:52 +08:00
parent ad4725342a
commit 5a9f4f9a89
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
flatpak/io.github.softfever.OrcaSlicer.yml
View File

@ -138,31 +138,26 @@ modules:
- name: orca_deps - name: orca_deps
buildsystem: simple buildsystem: simple
build-options:
env:
# Keep downloads in a persistent location
DEP_DOWNLOAD_DIR: /app/external-packages
build-commands: build-commands:
# start build # start build
- | - |
mkdir deps/build && cd deps/build mkdir deps/build && cd deps/build
cmake ../ \ cmake ../ \
-DDEP_WX_GTK3=ON \ -DDEP_WX_GTK3=ON \
-DDEP_DOWNLOAD_DIR=/app/external-packages \ -DDEP_DOWNLOAD_DIR=/run/build/orca_deps/external-packages \
-DCMAKE_PREFIX_PATH=/app \ -DCMAKE_PREFIX_PATH=/app \
-DDESTDIR=/app \ -DDESTDIR=/app \
-DCMAKE_INSTALL_LIBDIR=/app/lib \ -DCMAKE_INSTALL_LIBDIR=/app/lib \
-DFLATPAK=ON \ -DFLATPAK=ON \
-DCMAKE_INSTALL_PREFIX=/app -DCMAKE_INSTALL_PREFIX=/app
cmake --build . cmake --build .
# Don't remove external-packages rm -r /run/build/orca_deps/external-packages
cleanup: cleanup:
- /app/include - /app/include
- "*.a" - "*.a"
- "*.la" - "*.la"
- /app/lib/cmake - /app/lib/cmake
- /app/external-packages # Clean up after build instead
sources: sources:
# - # -

2
version.inc
View File

@ -10,7 +10,7 @@ endif()
if(NOT DEFINED BBL_INTERNAL_TESTING) if(NOT DEFINED BBL_INTERNAL_TESTING)
set(BBL_INTERNAL_TESTING "0") set(BBL_INTERNAL_TESTING "0")
endif() endif()
set(SoftFever_VERSION "2.3.0-dev") set(SoftFever_VERSION "2.35.0-dev")
string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)"
SoftFever_VERSION_MATCH ${SoftFever_VERSION}) SoftFever_VERSION_MATCH ${SoftFever_VERSION})
set(ORCA_VERSION_MAJOR ${CMAKE_MATCH_1}) set(ORCA_VERSION_MAJOR ${CMAKE_MATCH_1})