Skip to content

Commit

Permalink
clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
SoftFever committed Aug 9, 2023
1 parent a4c6320 commit 37c54aa
Show file tree
Hide file tree
Showing 128 changed files with 692 additions and 2,478 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- 'src/**'
- '**/CMakeLists.txt'
- 'version.inc'
- 'bbl/**'
- 'localization/**'
- 'resources/**'

pull_request:
Expand All @@ -18,7 +18,7 @@ on:
- 'src/**'
- '**/CMakeLists.txt'
- 'version.inc'
- 'bbl/**'
- 'localization/**'
- 'resources/**'

jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_mac_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- 'src/**'
- '**/CMakeLists.txt'
- 'version.inc'
- 'bbl/**'
- 'localization/**'
- 'resources/**'

pull_request:
Expand All @@ -18,7 +18,7 @@ on:
- 'src/**'
- '**/CMakeLists.txt'
- 'version.inc'
- 'bbl/**'
- 'localization/**'
- 'resources/**'

jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_mac_x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- 'src/**'
- '**/CMakeLists.txt'
- 'version.inc'
- 'bbl/**'
- 'localization/**'
- 'resources/**'

pull_request:
Expand All @@ -18,7 +18,7 @@ on:
- 'src/**'
- '**/CMakeLists.txt'
- 'version.inc'
- 'bbl/**'
- 'localization/**'
- 'resources/**'

jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- 'src/**'
- '**/CMakeLists.txt'
- 'version.inc'
- 'bbl/**'
- 'localization/**'
- 'resources/**'
- '.github/workflows/build_win.yml'

Expand All @@ -19,7 +19,7 @@ on:
- 'src/**'
- '**/CMakeLists.txt'
- 'version.inc'
- 'bbl/**'
- 'localization/**'
- 'resources/**'
- '.github/workflows/build_win.yml'

Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,4 @@ build_*/
SVG
src/OrcaSlicer-doc/
.idea/
bbl/i18n/es/OrcaSlicer_es.mo
bbl/i18n/es/OrcaSlicer.mo
/.cache/
103 changes: 0 additions & 103 deletions BambuStudio.sublime-project

This file was deleted.

2 changes: 1 addition & 1 deletion BuildLinux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ then
mkdir build
fi

# Addtional Dev packages for BambuStudio
# Addtional Dev packages for OrcaSlicer
export REQUIRED_DEV_PACKAGES="libmspack-dev libgstreamerd-3-dev libsecret-1-dev libwebkit2gtk-4.0-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules"
# libwebkit2gtk-4.1-dev ??
export DEV_PACKAGES_COUNT=$(echo ${REQUIRED_DEV_PACKAGES} | wc -w)
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ endif ()

# l10n
set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/i18n")
set(BBL_L18N_DIR "${CMAKE_CURRENT_SOURCE_DIR}/bbl/i18n")
set(BBL_L18N_DIR "${CMAKE_CURRENT_SOURCE_DIR}/localization/i18n")
add_custom_target(gettext_make_pot
COMMAND xgettext --keyword=L --keyword=_L --keyword=_u8L --keyword=L_CONTEXT:1,2c --keyword=_L_PLURAL:1,2 --add-comments=TRN --from-code=UTF-8 --no-location --debug --boost
-f "${BBL_L18N_DIR}/list.txt"
Expand Down Expand Up @@ -708,8 +708,8 @@ elseif (SLIC3R_FHS)
)
install(FILES src/platform/unix/OrcaSlicer.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
foreach(SIZE 32 128 192)
install(FILES ${SLIC3R_RESOURCES_DIR}/images/BambuStudio_${SIZE}px.png
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME BambuStudio.png
install(FILES ${SLIC3R_RESOURCES_DIR}/images/OrcaSlicer_${SIZE}px.png
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME OrcaSlicer.png
)
endforeach()
elseif (CMAKE_MACOSX_BUNDLE)
Expand Down
71 changes: 0 additions & 71 deletions Containerfile

This file was deleted.

15 changes: 0 additions & 15 deletions DockerBuild.sh

This file was deleted.

25 changes: 0 additions & 25 deletions DockerRun.sh

This file was deleted.

Loading

0 comments on commit 37c54aa

Please sign in to comment.