Skip to content

Commit

Permalink
build: Move SDL Makefile into submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
dracc committed May 14, 2019
1 parent a647c6d commit 6f3a258
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 22 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ include $(NXDK_DIR)/lib/net/Makefile
endif

ifneq ($(NXDK_SDL),)
include $(NXDK_DIR)/lib/sdl/SDL2/Makefile.xbox
include $(NXDK_DIR)/lib/sdl/Makefile
endif

Expand Down
22 changes: 1 addition & 21 deletions lib/sdl/Makefile
Original file line number Diff line number Diff line change
@@ -1,22 +1,3 @@
# Include SDL sources
SDL_DIR = $(NXDK_DIR)/lib/sdl/SDL2
SDL_SRCS += $(wildcard $(SDL_DIR)/src/*.c)
SDL_SRCS += $(wildcard $(SDL_DIR)/src/cpuinfo/*.c)
SDL_SRCS += $(wildcard $(SDL_DIR)/src/events/*.c)
SDL_SRCS += $(wildcard $(SDL_DIR)/src/file/*.c)
SDL_SRCS += $(wildcard $(SDL_DIR)/src/render/*.c)
SDL_SRCS += $(wildcard $(SDL_DIR)/src/render/software/*.c)
SDL_SRCS += $(wildcard $(SDL_DIR)/src/stdlib/*.c)
SDL_SRCS += $(wildcard $(SDL_DIR)/src/thread/*.c)
SDL_SRCS += $(wildcard $(SDL_DIR)/src/thread/generic/*.c)
SDL_SRCS += $(wildcard $(SDL_DIR)/src/timer/*.c)
SDL_SRCS += $(wildcard $(SDL_DIR)/src/timer/dummy/*.c)
SDL_SRCS += $(wildcard $(SDL_DIR)/src/video/*.c)
SDL_SRCS += $(wildcard $(SDL_DIR)/src/video/xbox/*.c)
SDL_SRCS += $(wildcard $(SDL_DIR)/src/video/yuv2rgb/*.c)
SDL_SRCS += $(wildcard $(SDL_DIR)/src/libm/*.c)
SDL_SRCS += $(wildcard $(SDL_DIR)/src/atomic/*.c)

SDL_TTF_DIR = $(NXDK_DIR)/lib/sdl/SDL_ttf
SDL_TTF_SRCS += $(SDL_TTF_DIR)/SDL_ttf.c

Expand All @@ -33,9 +14,8 @@ FREETYPE_SRCS += $(FREETYPE_DIR)/src/smooth/smooth.c
FREETYPE_SRCS += $(FREETYPE_DIR)/src/autofit/autofit.c
FREETYPE_SRCS += $(FREETYPE_DIR)/src/sfnt/sfnt.c

SRCS += $(SDL_SRCS) $(SDL_TTF_SRCS) $(FREETYPE_SRCS)
SRCS += $(SDL_TTF_SRCS) $(FREETYPE_SRCS)
CFLAGS += -I$(NXDK_DIR)/lib/sdl \
-I$(SDL_DIR)/include \
-I$(SDL_TTF_DIR) \
-I$(FREETYPE_DIR)/include \
-DXBOX
2 changes: 1 addition & 1 deletion lib/sdl/SDL2
Submodule SDL2 updated 1 files
+21 −0 Makefile.xbox

0 comments on commit 6f3a258

Please sign in to comment.