devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

themeeditor: Don't double-compile quazip, just use the same one as rbutil

Browse source 
Change-Id: I470364c4184b3e176bc30d7957dd1c7703bb6046
This commit is contained in:
Solomon Peachy 2024-12-04 15:06:04 -05:00
parent 27da734a73
commit a565734e47
3 changed files with 8 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

26
utils/themeeditor/CMakeLists.txt
View file

@ -13,6 +13,13 @@
# KIND, either express or implied. # KIND, either express or implied.
# #
find_package(QuaZip-Qt${QT_VERSION_MAJOR} QUIET)
if(QuaZip-Qt${QT_VERSION_MAJOR}_FOUND)
set(QUAZIP_LIBRARY QuaZip::QuaZip)
else()
set(QUAZIP_LIBRARY quazip)
endif()
add_executable(RockboxThemeEditor WIN32 MACOSX_BUNDLE add_executable(RockboxThemeEditor WIN32 MACOSX_BUNDLE
graphics/rbalbumart.cpp graphics/rbalbumart.cpp
graphics/rbalbumart.h graphics/rbalbumart.h
@ -103,23 +110,6 @@ add_executable(RockboxThemeEditor WIN32 MACOSX_BUNDLE
qtfindreplacedialog/findreplaceform.ui qtfindreplacedialog/findreplaceform.ui
qtfindreplacedialog/varianteditor.cpp qtfindreplacedialog/varianteditor.cpp
qtfindreplacedialog/varianteditor.h qtfindreplacedialog/varianteditor.h
quazip/ioapi.h
quazip/qioapi.cpp
quazip/minizip_crypt.h
quazip/quazip.cpp
quazip/quazip.h
quazip/quazipfile.cpp
quazip/quazipfile.h
quazip/quazipfileinfo.h
quazip/quazipfileinfo.cpp
quazip/quazipnewinfo.cpp
quazip/quazipnewinfo.h
quazip/unzip.c
quazip/unzip.h
quazip/zip.c
quazip/zip.h
zlib/zconf.h
zlib/zlib.h
resources.qrc resources.qrc
themeeditor.rc themeeditor.rc
) )
@ -129,7 +119,7 @@ set_target_properties(RockboxThemeEditor PROPERTIES AUTOUIC ON)
target_link_libraries(RockboxThemeEditor target_link_libraries(RockboxThemeEditor
Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Core
skin_parser z) skin_parser z ${QUAZIP_LIBRARY})
target_include_directories(RockboxThemeEditor PRIVATE models graphics gui qtfindreplacedialog quazip) target_include_directories(RockboxThemeEditor PRIVATE models graphics gui qtfindreplacedialog quazip)
target_compile_definitions(RockboxThemeEditor PRIVATE FINDREPLACE_NOLIB) target_compile_definitions(RockboxThemeEditor PRIVATE FINDREPLACE_NOLIB)

1
utils/themeeditor/quazip
View file

@ -1 +0,0 @@
../rbutilqt/quazip

1
utils/themeeditor/zlib
View file

@ -1 +0,0 @@
../rbutilqt/zlib