removed STD archeus, moved console and ssh into linux folder. also added libdbus
This commit is contained in:
parent
119d1b2c64
commit
8fe402e04e
27 changed files with 622 additions and 145 deletions
|
|
@ -1,9 +1,9 @@
|
|||
set(ARCHEUS_STD_SDL2_WINDOW_SOURCES
|
||||
set(ARCHEUS_SDL2_WINDOW_SOURCES
|
||||
packages/graphics/sdl/window.c
|
||||
packages/graphics/sdl/renderer.c
|
||||
)
|
||||
|
||||
set(ARCHEUS_STD_SDL2_INPUT_SOURCES
|
||||
set(ARCHEUS_SDL2_INPUT_SOURCES
|
||||
packages/input/sdl/input.c
|
||||
packages/input/sdl/keyboard.c
|
||||
packages/input/sdl/mouse.c
|
||||
|
|
@ -12,7 +12,7 @@ set(ARCHEUS_STD_SDL2_INPUT_SOURCES
|
|||
packages/audio/sdl/config.c
|
||||
)
|
||||
|
||||
set(ARCHEUS_STD_SDL2_GRAPHICS_SOURCES
|
||||
set(ARCHEUS_SDL2_GRAPHICS_SOURCES
|
||||
packages/graphics/sdl/circle.c
|
||||
packages/graphics/sdl/config.c
|
||||
packages/graphics/sdl/line.c
|
||||
|
|
@ -23,9 +23,9 @@ set(ARCHEUS_STD_SDL2_GRAPHICS_SOURCES
|
|||
packages/graphics/sdl/text.c
|
||||
)
|
||||
|
||||
function(sdl2_check_and_init_needed _ARCHEUS_STD_SOURCES _ARCHEUS_STD_INCLUDE_DIRECTORIES _ARCHEUS_STD_LINK_LIBRARIES ARCHEUS_STD_WINDOW_BACKEND ARCHEUS_STD_INPUT_BACKEND ARCHEUS_STD_GRAPHICS_BACKEND)
|
||||
function(sdl2_check_and_init_needed _ARCHEUS_SOURCES _ARCHEUS_INCLUDE_DIRECTORIES _ARCHEUS_LINK_LIBRARIES ARCHEUS_WINDOW_BACKEND ARCHEUS_INPUT_BACKEND ARCHEUS_GRAPHICS_BACKEND)
|
||||
#if no backend uses sdl return
|
||||
if(NOT ${ARCHEUS_STD_WINDOW_BACKEND} STREQUAL "SDL2" AND NOT ${ARCHEUS_STD_INPUT_BACKEND} STREQUAL "SDL2" AND NOT ${ARCHEUS_STD_GRAPHICS_BACKEND} STREQUAL "SDL2")
|
||||
if(NOT ${ARCHEUS_WINDOW_BACKEND} STREQUAL "SDL2" AND NOT ${ARCHEUS_INPUT_BACKEND} STREQUAL "SDL2" AND NOT ${ARCHEUS_GRAPHICS_BACKEND} STREQUAL "SDL2")
|
||||
return()
|
||||
endif()
|
||||
|
||||
|
|
@ -33,51 +33,51 @@ function(sdl2_check_and_init_needed _ARCHEUS_STD_SOURCES _ARCHEUS_STD_INCLUDE_DI
|
|||
find_package(SDL2 REQUIRED)
|
||||
|
||||
#add to include directories
|
||||
list(APPEND ${_ARCHEUS_STD_INCLUDE_DIRECTORIES}
|
||||
list(APPEND ${_ARCHEUS_INCLUDE_DIRECTORIES}
|
||||
PRIVATE ${SDL2_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
#add to link libraries
|
||||
list(APPEND ${_ARCHEUS_STD_LINK_LIBRARIES}
|
||||
list(APPEND ${_ARCHEUS_LINK_LIBRARIES}
|
||||
PUBLIC ${SDL2_LIBRARIES}
|
||||
)
|
||||
|
||||
#add matching files for the selected backends
|
||||
if(${ARCHEUS_STD_WINDOW_BACKEND} STREQUAL "SDL2")
|
||||
list(APPEND ${_ARCHEUS_STD_SOURCES} ${ARCHEUS_STD_SDL2_WINDOW_SOURCES})
|
||||
if(${ARCHEUS_WINDOW_BACKEND} STREQUAL "SDL2")
|
||||
list(APPEND ${_ARCHEUS_SOURCES} ${ARCHEUS_SDL2_WINDOW_SOURCES})
|
||||
endif()
|
||||
|
||||
if(${ARCHEUS_STD_INPUT_BACKEND} STREQUAL "SDL2")
|
||||
if(${ARCHEUS_INPUT_BACKEND} STREQUAL "SDL2")
|
||||
#TODO: remove this
|
||||
find_package(SDL2_mixer REQUIRED)
|
||||
|
||||
list(APPEND ${_ARCHEUS_STD_SOURCES} ${ARCHEUS_STD_SDL2_INPUT_SOURCES})
|
||||
list(APPEND ${_ARCHEUS_SOURCES} ${ARCHEUS_SDL2_INPUT_SOURCES})
|
||||
|
||||
#TODO: remove this
|
||||
list(APPEND ${_ARCHEUS_STD_LINK_LIBRARIES}
|
||||
list(APPEND ${_ARCHEUS_LINK_LIBRARIES}
|
||||
PUBLIC SDL2_mixer::SDL2_mixer
|
||||
)
|
||||
endif()
|
||||
|
||||
if(${ARCHEUS_STD_GRAPHICS_BACKEND} STREQUAL "SDL2")
|
||||
if(${ARCHEUS_GRAPHICS_BACKEND} STREQUAL "SDL2")
|
||||
find_package(SDL2_image REQUIRED)
|
||||
find_package(SDL2_ttf REQUIRED)
|
||||
|
||||
list(APPEND ${_ARCHEUS_STD_SOURCES} ${ARCHEUS_STD_SDL2_GRAPHICS_SOURCES})
|
||||
list(APPEND ${_ARCHEUS_SOURCES} ${ARCHEUS_SDL2_GRAPHICS_SOURCES})
|
||||
|
||||
#add to include directories
|
||||
list(APPEND ${_ARCHEUS_STD_INCLUDE_DIRECTORIES}
|
||||
list(APPEND ${_ARCHEUS_INCLUDE_DIRECTORIES}
|
||||
PRIVATE ${SDL2IMAGE_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
#add to link libraries
|
||||
list(APPEND ${_ARCHEUS_STD_LINK_LIBRARIES}
|
||||
list(APPEND ${_ARCHEUS_LINK_LIBRARIES}
|
||||
PUBLIC SDL2_image::SDL2_image
|
||||
PUBLIC SDL2_ttf::SDL2_ttf
|
||||
)
|
||||
endif()
|
||||
|
||||
set(${_ARCHEUS_STD_SOURCES} ${${_ARCHEUS_STD_SOURCES}} PARENT_SCOPE)
|
||||
set(${_ARCHEUS_STD_INCLUDE_DIRECTORIES} ${${_ARCHEUS_STD_INCLUDE_DIRECTORIES}} PARENT_SCOPE)
|
||||
set(${_ARCHEUS_STD_LINK_LIBRARIES} ${${_ARCHEUS_STD_LINK_LIBRARIES}} PARENT_SCOPE)
|
||||
set(${_ARCHEUS_SOURCES} ${${_ARCHEUS_SOURCES}} PARENT_SCOPE)
|
||||
set(${_ARCHEUS_INCLUDE_DIRECTORIES} ${${_ARCHEUS_INCLUDE_DIRECTORIES}} PARENT_SCOPE)
|
||||
set(${_ARCHEUS_LINK_LIBRARIES} ${${_ARCHEUS_LINK_LIBRARIES}} PARENT_SCOPE)
|
||||
endfunction()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue