chore(build): migrate to system lib

This commit is contained in:
fallenoak 2020-12-02 20:32:58 -06:00
parent 717557b18c
commit e9ff935840
No known key found for this signature in database
GPG key ID: 7628F8E61AEA070D
4 changed files with 7 additions and 20 deletions

3
.gitmodules vendored
View file

@ -1,3 +1,6 @@
[submodule "vendor/squall"] [submodule "vendor/squall"]
path = lib/squall path = lib/squall
url = https://github.com/whoahq/squall url = https://github.com/whoahq/squall
[submodule "lib/system"]
path = lib/system
url = https://github.com/whoahq/system

View file

@ -18,24 +18,7 @@ project(tempest)
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
# Arch defines include(lib/system/cmake/system.cmake)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(WHOA_ARCH_64 1)
elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
set(WHOA_ARCH_32 1)
endif()
# OS defines
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set(WHOA_PLATFORM_WIN 1)
add_definitions(-DWHOA_PLATFORM_WIN)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(WHOA_PLATFORM_LINUX 1)
add_definitions(-DWHOA_PLATFORM_LINUX)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(WHOA_PLATFORM_MAC 1)
add_definitions(-DWHOA_PLATFORM_MAC)
endif()
add_subdirectory(lib) add_subdirectory(lib)
add_subdirectory(tempest) add_subdirectory(tempest)

1
lib/system Submodule

@ -0,0 +1 @@
Subproject commit f886ab5bc35b2e0d968baa8dec3faaccf385fbc3

View file

@ -1,6 +1,6 @@
file(GLOB_RECURSE TEST_SOURCES "*.cpp") file(GLOB_RECURSE TEST_SOURCES "*.cpp")
if(WHOA_PLATFORM_MAC) if(WHOA_SYSTEM_MAC)
set_source_files_properties(${TEST_SOURCES} set_source_files_properties(${TEST_SOURCES}
PROPERTIES COMPILE_FLAGS "-x objective-c++" PROPERTIES COMPILE_FLAGS "-x objective-c++"
) )
@ -14,7 +14,7 @@ if(WHOA_PLATFORM_MAC)
) )
endif() endif()
if(WHOA_PLATFORM_LINUX OR WHOA_PLATFORM_WIN) if(WHOA_SYSTEM_LINUX OR WHOA_SYSTEM_WIN)
add_executable(TempestTest ${TEST_SOURCES}) add_executable(TempestTest ${TEST_SOURCES})
target_link_libraries(TempestTest target_link_libraries(TempestTest