Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 29 #30

Merged
merged 12 commits into from
Apr 6, 2023
Merged

Issue 29 #30

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
878d1b9
prepared release assets
mkalkbrenner Mar 31, 2023
572ece2
Merge branch 'zesinger:main' into main
mkalkbrenner Mar 31, 2023
99460a5
fixed macOS path
mkalkbrenner Mar 31, 2023
ad6ade9
mark auto releases as draft
mkalkbrenner Mar 31, 2023
0142d08
uses zip for release files
mkalkbrenner Mar 31, 2023
97a1ca3
fixed indention
mkalkbrenner Mar 31, 2023
5877578
fixed Package
mkalkbrenner Mar 31, 2023
5fd66a4
zip
mkalkbrenner Mar 31, 2023
ff92d21
fixed macOS zip
mkalkbrenner Mar 31, 2023
70d75e4
Merge branch 'zesinger:main' into main
mkalkbrenner Apr 2, 2023
00aea88
use serum64 as name for windows 64 bit, closes #29
mkalkbrenner Apr 6, 2023
550b9b9
different approach
mkalkbrenner Apr 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ set(VERSION_PATCH "${CMAKE_MATCH_1}")
project(serum VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}"
DESCRIPTION "Cross-platform library for decoding Serum files, a colorization format for pinball ROMs.")

set(LIB_NAME "serum")
if(USE_OSXARM)
set(CMAKE_OSX_ARCHITECTURES arm64)
elseif(USE_OSXINTEL)
Expand All @@ -38,16 +39,18 @@ elseif(USE_IOS OR USE_TVOS)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_C_FLAGS -fembed-bitcode)
set(CMAKE_CXX_FLAGS -fembed-bitcode)
elseif(USE_WIN32)
add_compile_definitions(WIN32)
elseif(USE_ANDROID)
else()
set(LIB_NAME "serum64")
endif()

set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
set(CMAKE_C_STANDARD 99)
set(CMAKE_C_VISIBILITY_PRESET hidden)

if(USE_WIN32)
add_compile_definitions(WIN32)
endif()

set(LIBRARY_SOURCES
src/miniz/miniz.h
Expand All @@ -66,7 +69,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
if(NOT USE_IOS AND NOT USE_TVOS)
add_library(serum_shared SHARED ${LIBRARY_SOURCES})
set_target_properties(serum_shared PROPERTIES
OUTPUT_NAME "serum"
OUTPUT_NAME ${LIB_NAME}
VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}
LINK_FLAGS_RELEASE -s
)
Expand Down