-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
458 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,150 @@ | ||
| --- a/SamTFE/Sources/CMakeLists.txt 2023-12-26 13:14:52.642181538 +0300 | ||
| +++ b/SamTFE/Sources/CMakeLists.txt 2024-01-25 13:11:34.028642313 +0300 | ||
| @@ -239,16 +239,6 @@ | ||
| endif() | ||
| endif() | ||
|
|
||
| -# ImageMagic needed for SYSTEM INSTALL | ||
| -if(NOT LOCAL_INSTALL) | ||
| - find_package(ImageMagick COMPONENTS convert) | ||
| - if(ImageMagick_convert_FOUND) | ||
| - #message(STATUS "ImageMagick convert found: ${ImageMagick_convert_EXECUTABLE}") | ||
| - else() | ||
| - message(FATAL_ERROR "Error! LOCAL_INSTAL is set but neccessary ImageMagick convert are missing") | ||
| - endif() | ||
| -endif() | ||
| - | ||
| # remove clang spam. | ||
| if(MACOSX) | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-nullability-completeness -Wno-deprecated") | ||
| @@ -327,10 +317,10 @@ | ||
| message(STATUS "Operating system name: ${CMAKE_OS_NAME}") | ||
|
|
||
| set(CMAKE_ARCH_BITS 32) | ||
| -set(CMAKE_INSTALL_LIBDIR "/usr/lib") | ||
| +set(CMAKE_INSTALL_LIBDIR "/app/lib") | ||
| +set(CMAKE_INSTALL_PREFIX "/app") | ||
| if(CMAKE_SIZEOF_VOID_P EQUAL 8) | ||
| set(CMAKE_ARCH_BITS 64) | ||
| - set(CMAKE_INSTALL_LIBDIR "/usr/lib64") | ||
| endif() | ||
|
|
||
| if(FREEBSD) | ||
| @@ -393,9 +383,9 @@ | ||
| add_compile_options(-mpowerpc64) | ||
| else() | ||
| if(LOCAL_INSTALL) | ||
| - add_compile_options(-march=native) | ||
| + add_compile_options(-mtune=generic) | ||
| elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i586|i686|x86|amd64|AMD64|x86_64") | ||
| - add_compile_options(-march=native) # set mtune=generic if nedded | ||
| + add_compile_options(-mtune=generic) # set mtune=generic if nedded | ||
| endif() | ||
| endif() | ||
| endif() | ||
| @@ -1814,24 +1804,14 @@ | ||
| install(FILES ${CMAKE_ADD_TARGET_DIR}/../SE1_10b.gro | ||
| DESTINATION "${CMAKE_INSTALL_PREFIX}/share/${INTERNAL_NAME}" | ||
| PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) | ||
| - install(FILES "${CMAKE_ADD_TARGET_DIR}/../${INTERNAL_NAME}.desktop" | ||
| + install(FILES "${CMAKE_ADD_TARGET_DIR}/../${INTERNAL_NAME}.desktop" RENAME "io.itch.tx00100xt.SeriousSamClassic-VK.${INTERNAL_NAME}.desktop" | ||
| DESTINATION "${CMAKE_INSTALL_PREFIX}//share/applications" | ||
| PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) | ||
| - set(A 16) | ||
| - set(B 32) | ||
| - set(C 48) | ||
| - set(D 64) | ||
| - set(E 128) | ||
| - foreach(X IN LISTS A B C D E) | ||
| - #message(STATUS "Create icon ${X}x${X}") | ||
| - execute_process ( | ||
| - COMMAND bash -c "${ImageMagick_convert_EXECUTABLE} ${CMAKE_ADD_TARGET_DIR}/../${INTERNAL_NAME}.png -scale ${X}x${X} ${CMAKE_ADD_TARGET_DIR}/../${X}.png;" | ||
| - OUTPUT_VARIABLE outVar | ||
| - ) | ||
| - install(FILES ${CMAKE_ADD_TARGET_DIR}/../${X}.png | ||
| - DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/${X}x${X}/apps" RENAME "${INTERNAL_NAME}.png" | ||
| - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) | ||
| - endforeach() | ||
| + | ||
| + install(FILES ${CMAKE_ADD_TARGET_DIR}/../${INTERNAL_NAME}.png | ||
| + DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256/apps" RENAME "io.itch.tx00100xt.SeriousSamClassic-VK.${INTERNAL_NAME}.png" | ||
| + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) | ||
| + | ||
| endif() | ||
|
|
||
| # end of CMakeLists.txt ... | ||
| --- a/SamTSE/Sources/CMakeLists.txt 2023-12-26 13:14:52.642181538 +0300 | ||
| +++ b/SamTSE/Sources/CMakeLists.txt 2024-01-25 13:11:34.028642313 +0300 | ||
| @@ -239,16 +239,6 @@ | ||
| endif() | ||
| endif() | ||
|
|
||
| -# ImageMagic needed for SYSTEM INSTALL | ||
| -if(NOT LOCAL_INSTALL) | ||
| - find_package(ImageMagick COMPONENTS convert) | ||
| - if(ImageMagick_convert_FOUND) | ||
| - #message(STATUS "ImageMagick convert found: ${ImageMagick_convert_EXECUTABLE}") | ||
| - else() | ||
| - message(FATAL_ERROR "Error! LOCAL_INSTAL is set but neccessary ImageMagick convert are missing") | ||
| - endif() | ||
| -endif() | ||
| - | ||
| # remove clang spam. | ||
| if(MACOSX) | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-nullability-completeness -Wno-deprecated") | ||
| @@ -327,10 +317,10 @@ | ||
| message(STATUS "Operating system name: ${CMAKE_OS_NAME}") | ||
|
|
||
| set(CMAKE_ARCH_BITS 32) | ||
| -set(CMAKE_INSTALL_LIBDIR "/usr/lib") | ||
| +set(CMAKE_INSTALL_LIBDIR "/app/lib") | ||
| +set(CMAKE_INSTALL_PREFIX "/app") | ||
| if(CMAKE_SIZEOF_VOID_P EQUAL 8) | ||
| set(CMAKE_ARCH_BITS 64) | ||
| - set(CMAKE_INSTALL_LIBDIR "/usr/lib64") | ||
| endif() | ||
|
|
||
| if(FREEBSD) | ||
| @@ -393,9 +383,9 @@ | ||
| add_compile_options(-mpowerpc64) | ||
| else() | ||
| if(LOCAL_INSTALL) | ||
| - add_compile_options(-march=native) | ||
| + add_compile_options(-mtune=generic) | ||
| elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i586|i686|x86|amd64|AMD64|x86_64") | ||
| - add_compile_options(-march=native) # set mtune=generic if nedded | ||
| + add_compile_options(-mtune=generic) # set mtune=generic if nedded | ||
| endif() | ||
| endif() | ||
| endif() | ||
| @@ -1814,24 +1804,14 @@ | ||
| install(FILES ${CMAKE_ADD_TARGET_DIR}/../SE1_10b.gro | ||
| DESTINATION "${CMAKE_INSTALL_PREFIX}/share/${INTERNAL_NAME}" | ||
| PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) | ||
| - install(FILES "${CMAKE_ADD_TARGET_DIR}/../${INTERNAL_NAME}.desktop" | ||
| + install(FILES "${CMAKE_ADD_TARGET_DIR}/../${INTERNAL_NAME}.desktop" RENAME "io.itch.tx00100xt.SeriousSamClassic-VK.${INTERNAL_NAME}.desktop" | ||
| DESTINATION "${CMAKE_INSTALL_PREFIX}//share/applications" | ||
| PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) | ||
| - set(A 16) | ||
| - set(B 32) | ||
| - set(C 48) | ||
| - set(D 64) | ||
| - set(E 128) | ||
| - foreach(X IN LISTS A B C D E) | ||
| - #message(STATUS "Create icon ${X}x${X}") | ||
| - execute_process ( | ||
| - COMMAND bash -c "${ImageMagick_convert_EXECUTABLE} ${CMAKE_ADD_TARGET_DIR}/../${INTERNAL_NAME}.png -scale ${X}x${X} ${CMAKE_ADD_TARGET_DIR}/../${X}.png;" | ||
| - OUTPUT_VARIABLE outVar | ||
| - ) | ||
| - install(FILES ${CMAKE_ADD_TARGET_DIR}/../${X}.png | ||
| - DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/${X}x${X}/apps" RENAME "${INTERNAL_NAME}.png" | ||
| - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) | ||
| - endforeach() | ||
| + | ||
| + install(FILES ${CMAKE_ADD_TARGET_DIR}/../${INTERNAL_NAME}.png | ||
| + DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256/apps" RENAME "io.itch.tx00100xt.SeriousSamClassic-VK.${INTERNAL_NAME}.png" | ||
| + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) | ||
| + | ||
| endif() | ||
|
|
||
| # end of CMakeLists.txt ... |
Oops, something went wrong.