Skip to content

Commit

Permalink
stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
igagis committed Dec 23, 2024
1 parent 3e4a9d4 commit 6e6a296
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
3 changes: 2 additions & 1 deletion debian/control.in
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ Build-Depends:
libgles2-mesa-dev,
libgtk-3-dev,
libwayland-dev,
libxkbcommon-dev
libxkbcommon-dev,
libsdl2-dev
Build-Depends-Indep: doxygen
Standards-Version: 3.9.5

Expand Down
10 changes: 8 additions & 2 deletions src/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,10 @@ define ruisapp_rules

this_name := ruisapp-$1$(if $2,-$2)

ifeq ($(os), linux)
ifeq ($2,sdl)
this_ldlibs += -lSDL2
this_cxxflags += -D RUISAPP_SDL
else ifeq ($(os), linux)
# use -isystem instead of -I to prevent clang-tidy follow the includes from these locations
this_cxxflags += $$(patsubst -I%,-isystem%,$$(shell pkg-config --cflags gdk-3.0))
this_ldlibs += $$(shell pkg-config --libs gdk-3.0)
Expand All @@ -70,8 +73,9 @@ define ruisapp_rules
this_ldlibs += -lxkbcommon
this_cxxflags += -isystem $(dir $(wayland_shell_protocol_header))
this_cxxflags += -D RUISAPP_WAYLAND
else
else ifeq ($2,xorg)
this_ldlibs += -lX11
else
endif
else ifeq ($(os), windows)
this_ldlibs += -lgdi32 -lopengl32 -lglew32
Expand Down Expand Up @@ -120,6 +124,8 @@ ifeq ($(os), linux)
$(eval $(call ruisapp_rules,opengles,xorg))
# $(eval $(call ruisapp_rules,opengl,wayland))
$(eval $(call ruisapp_rules,opengles,wayland))
$(eval $(call ruisapp_rules,opengl,sdl))
$(eval $(call ruisapp_rules,opengles,sdl))
else
$(eval $(call ruisapp_rules,opengl,))
endif
Expand Down
4 changes: 3 additions & 1 deletion src/ruisapp/glue/glue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#include <utki/config.hpp>

#if CFG_OS == CFG_OS_WINDOWS
#ifdef RUISAPP_SDL
# include "sdl/glue.cxx"
#elif CFG_OS == CFG_OS_WINDOWS
// NOLINTNEXTLINE(bugprone-suspicious-include)
# include "windows/glue.cxx"
#elif CFG_OS == CFG_OS_LINUX && CFG_OS_NAME == CFG_OS_NAME_ANDROID
Expand Down
Empty file added src/ruisapp/glue/sdl/glue.cxx
Empty file.

0 comments on commit 6e6a296

Please sign in to comment.