jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-09 01:23:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove logic for old ccache versions, 32bit, comments

Browse source
This commit is contained in:
tooomm 2026-07-07 18:07:27 +02:00
parent 544906042a
commit d90e5263e0
10 changed files with 47 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cockatrice/CMakeLists.txt
View file

@ -1,12 +1,12 @@
# CMakeLists for cockatrice directory
#
# provides the cockatrice binary
# Provides the cockatrice binary
project(Cockatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
set(cockatrice_SOURCES
${VERSION_STRING_CPP}
# sort by alphabetical order, so that there is no debate about where to add new sources to the list
# Sort by alphabetical order, so that there is no debate about where to add new sources to the list
src/client/network/connection_controller/remote_connection_controller.cpp
src/client/network/update/client/update_downloader.cpp
src/client/network/interfaces/deck_stats_interface.cpp
@ -387,7 +387,7 @@ else()
file(GLOB cockatrice_TS "${CMAKE_CURRENT_SOURCE_DIR}/translations/*.ts")
endif()
if(WIN32)
if(WIN32) # Windows (including 64bit)
set(cockatrice_SOURCES ${cockatrice_SOURCES} cockatrice.rc)
endif(WIN32)
@ -455,7 +455,7 @@ if(UNIX)
install(TARGETS cockatrice BUNDLE DESTINATION ./)
else()
# Assume linux
# Assume Linux
install(TARGETS cockatrice RUNTIME DESTINATION bin/)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.png DESTINATION ${ICONDIR}/hicolor/48x48/apps)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.svg DESTINATION ${ICONDIR}/hicolor/scalable/apps)
@ -466,7 +466,7 @@ elseif(WIN32)
endif()
if(APPLE)
# these needs to be relative to CMAKE_INSTALL_PREFIX
# These needs to be relative to CMAKE_INSTALL_PREFIX
set(plugin_dest_dir cockatrice.app/Contents/Plugins)
set(qtconf_dest_dir cockatrice.app/Contents/Resources)
@ -515,8 +515,8 @@ Data = Resources\")
)
endif()
if(WIN32)
# these needs to be relative to CMAKE_INSTALL_PREFIX
if(WIN32) # Windows (including 64bit)
# These needs to be relative to CMAKE_INSTALL_PREFIX
set(plugin_dest_dir Plugins)
set(qtconf_dest_dir .)

6
cockatrice/sounds/CMakeLists.txt
View file

@ -1,6 +1,6 @@
# CMakeLists for sounds directory
#
# add sounds subfolders
# Add sounds subfolders
set(defsounds Default Legacy)
@ -8,9 +8,9 @@ if(UNIX)
if(APPLE)
install(DIRECTORY ${defsounds} DESTINATION Cockatrice.app/Contents/Resources/sounds/)
else()
# Assume linux
# Assume Linux
install(DIRECTORY ${defsounds} DESTINATION share/cockatrice/sounds/)
endif()
elseif(WIN32)
elseif(WIN32) # Windows (including 64bit)
install(DIRECTORY ${defsounds} DESTINATION sounds/)
endif()

3
cockatrice/src/client/network/update/client/release_channel.cpp
View file

@ -59,7 +59,8 @@ bool ReleaseChannel::downloadMatchesCurrentOS(const QString &fileName)
char arch[255];
size_t len = sizeof(arch);
if (sysctlbyname("machdep.cpu.brand_string", arch, &len, nullptr, 0) == 0) {
// Intel Mac is only supported on macOS 13 versions
// We only publish one Intel build, targeting macOS 13 currently
// Newer macOS versions on Intel Macs should continue using it
if (QString::fromUtf8(arch).contains("Intel")) {
return 13;
}

4
cockatrice/src/interface/logger.h
View file

@ -13,9 +13,7 @@
#include <QTextStream>
#include <QVector>
#if defined(Q_PROCESSOR_X86_32)
#define BUILD_ARCHITECTURE "32-bit"
#elif defined(Q_PROCESSOR_X86_64)
#if defined(Q_PROCESSOR_X86_64)
#define BUILD_ARCHITECTURE "64-bit"
#elif defined(Q_PROCESSOR_ARM)
#define BUILD_ARCHITECTURE "ARM"

6
cockatrice/themes/CMakeLists.txt
View file

@ -1,6 +1,6 @@
# CMakeLists for themes directory
#
# add themes subfolders
# Add themes subfolders
set(defthemes Default Fabric Fusion Leather Plasma VelvetMarble)
@ -8,9 +8,9 @@ if(UNIX)
if(APPLE)
install(DIRECTORY ${defthemes} DESTINATION Cockatrice.app/Contents/Resources/themes/)
else()
# Assume linux
# Assume Linux
install(DIRECTORY ${defthemes} DESTINATION share/cockatrice/themes/)
endif()
elseif(WIN32)
elseif(WIN32) # Windows (including 64bit)
install(DIRECTORY ${defthemes} DESTINATION themes/)
endif()