geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unified build with both renderers

main
Ivan Epifanov 2020-11-23 12:44:54 +03:00 committed by Sam Lantinga
parent a1adc8a9d6
commit 6c3bf56503
4 changed files with 8 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.vita.gles2.dolce → Makefile.vita.dolce
View File

@ -21,6 +21,7 @@ SOURCES = \
src/filesystem/vita/*.c \ src/filesystem/vita/*.c \
src/render/*.c \ src/render/*.c \
src/render/software/*.c \ src/render/software/*.c \
src/render/vitagxm/*.c \
src/render/vitagles2/*.c \ src/render/vitagles2/*.c \
src/sensor/*.c \ src/sensor/*.c \
src/sensor/vita/*.c \ src/sensor/vita/*.c \
@ -41,7 +42,7 @@ CC = $(PREFIX)-gcc
AR = $(PREFIX)-ar AR = $(PREFIX)-ar
CFLAGS = -g -Wl,-q -Wall -O3 -Iinclude \ CFLAGS = -g -Wl,-q -Wall -O3 -Iinclude \
-D__VITA__ -D__ARM_ARCH=7 -D__ARM_ARCH_7A__ \ -D__VITA__ -D__ARM_ARCH=7 -D__ARM_ARCH_7A__ \
-mfpu=neon -mcpu=cortex-a9 -mfloat-abi=hard -D_VITA_GLES2_ -mfpu=neon -mcpu=cortex-a9 -mfloat-abi=hard
ASFLAGS = $(CFLAGS) ASFLAGS = $(CFLAGS)
$(TARGET_LIB): $(OBJS) $(TARGET_LIB): $(OBJS)

58
Makefile.vita.gxm.dolce
View File

@ -1,58 +0,0 @@
# Based on port by xerpi
# Makefile to build the SDL library
TARGET_LIB = libSDL2.a
SOURCES = \
src/*.c \
src/atomic/*.c \
src/audio/*.c \
src/audio/vita/*.c \
src/cpuinfo/*.c \
src/events/*.c \
src/file/*.c \
src/haptic/*.c \
src/haptic/dummy/*.c \
src/joystick/*.c \
src/joystick/vita/*.c \
src/loadso/dummy/*.c \
src/power/*.c \
src/power/vita/*.c \
src/filesystem/vita/*.c \
src/render/*.c \
src/render/software/*.c \
src/render/vitagxm/*.c \
src/sensor/*.c \
src/sensor/vita/*.c \
src/stdlib/*.c \
src/thread/*.c \
src/thread/generic/SDL_systls.c \
src/thread/vita/*.c \
src/timer/*.c \
src/timer/vita/*.c \
src/video/*.c \
src/video/vita/*.c \
src/video/yuv2rgb/*.c \
OBJS = $(shell echo $(SOURCES) | sed -e 's,\.c,\.o,g')
PREFIX = arm-dolce-eabi
CC = $(PREFIX)-gcc
AR = $(PREFIX)-ar
CFLAGS = -g -Wl,-q -Wall -O3 -Iinclude \
-D__VITA__ -D__ARM_ARCH=7 -D__ARM_ARCH_7A__ \
-mfpu=neon -mcpu=cortex-a9 -mfloat-abi=hard -D_VITA_GXM_
ASFLAGS = $(CFLAGS)
$(TARGET_LIB): $(OBJS)
$(AR) rcs $@ $^
clean:
@rm -f $(TARGET_LIB) $(OBJS)
install: $(TARGET_LIB)
@mkdir -p "$(DOLCESDK)/arm-dolce-eabi/lib"
@cp $(TARGET_LIB) $(DOLCESDK)/arm-dolce-eabi/lib
@mkdir -p "$(DOLCESDK)/arm-dolce-eabi/include/SDL2"
@cp include/*.h "$(DOLCESDK)/arm-dolce-eabi/include/SDL2"
@echo "Installed!"

6
include/SDL_config_vita.h
View File

@ -139,11 +139,11 @@
#define SDL_FILESYSTEM_VITA 1 #define SDL_FILESYSTEM_VITA 1
#define SDL_SENSOR_VITA 1 #define SDL_SENSOR_VITA 1
#if defined(_VITA_GLES2_) //#if defined(_VITA_GLES2_)
#define SDL_VIDEO_RENDER_VITA_GLES2 1 #define SDL_VIDEO_RENDER_VITA_GLES2 1
#else //#else
#define SDL_VIDEO_RENDER_VITA_GXM 1 #define SDL_VIDEO_RENDER_VITA_GXM 1
#endif //#endif
#if defined(SDL_VIDEO_RENDER_VITA_GLES2) || defined(SDL_VIDEO_RENDER_VITA_GXM) #if defined(SDL_VIDEO_RENDER_VITA_GLES2) || defined(SDL_VIDEO_RENDER_VITA_GXM)
#define SDL_VIDEO_OPENGL_ES2 1 #define SDL_VIDEO_OPENGL_ES2 1

6
src/render/SDL_render.c
View File

@ -104,12 +104,12 @@ static const SDL_RenderDriver *render_drivers[] = {
#if SDL_VIDEO_RENDER_PSP #if SDL_VIDEO_RENDER_PSP
&PSP_RenderDriver, &PSP_RenderDriver,
#endif #endif
#if SDL_VIDEO_RENDER_VITA_GLES2
&VITA_GLES2_RenderDriver,
#endif
#if SDL_VIDEO_RENDER_VITA_GXM #if SDL_VIDEO_RENDER_VITA_GXM
&VITA_GXM_RenderDriver, &VITA_GXM_RenderDriver,
#endif #endif
#if SDL_VIDEO_RENDER_VITA_GLES2
&VITA_GLES2_RenderDriver,
#endif
#if SDL_VIDEO_RENDER_SW #if SDL_VIDEO_RENDER_SW
&SW_RenderDriver &SW_RenderDriver
#endif #endif