Skip to content

Commit

Permalink
switch: all fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
Cpasjuste committed Mar 18, 2018
1 parent 5296aa8 commit f174a48
Show file tree
Hide file tree
Showing 20 changed files with 1,126 additions and 2,459 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Expand Up @@ -2,7 +2,9 @@
*.d
*.Td
OpenBOR.elf
OpenBOR.nro
meta.xml
engine/releases/
tools/

cmake-*
.idea
6 changes: 3 additions & 3 deletions engine/Makefile
Expand Up @@ -197,7 +197,7 @@ BUILD_GFX = 1
BUILD_VORBIS = 1
BUILDING = 1
CC = aarch64-none-elf-gcc
ARCHFLAGS = -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIC -ftls-model=local-exec
ARCHFLAGS = -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE -ffast-math -ffunction-sections -fdata-sections
INCLUDES = $(DEVKITPRO)/libnx/include \
$(DEVKITPRO)/portlibs/switch/include \
$(DEVKITPRO)/portlibs/switch/include/SDL2
Expand Down Expand Up @@ -403,7 +403,7 @@ GAME_CONSOLE = vita/control.o
endif

ifdef BUILD_SWITCH
GAME_CONSOLE += switch/joysticks.o \
GAME_CONSOLE = switch/joysticks.o \
switch/control.o \
switch/sblaster.o \
switch/timer.o \
Expand Down Expand Up @@ -637,7 +637,7 @@ LIBS += -lvita2d -lSceKernel_stub -lSceDisplay_stub -lSceGxm_stub \
endif

ifdef BUILD_SWITCH
LIBS += -lSDL2 -lSDL2_gfx -lnx -specs=$(DEVKITPRO)/libnx/switch.specs
LIBS += -lSDL2 -lSDL2_gfx -lnxnetprint -lnx -specs=$(DEVKITPRO)/libnx/switch.specs
endif

ifdef BUILD_STATIC
Expand Down
2 changes: 1 addition & 1 deletion engine/build.sh
Expand Up @@ -285,7 +285,7 @@ function switch {
export PATH=$OLD_PATH
. ./environ.sh 11
if test $DEVKITA64; then
make clean BUILD_SWITCH=1
# make clean BUILD_SWITCH=1
make BUILD_SWITCH=1
# if test -f "./OpenBOR.vpk"; then
# if test ! -e "./releases/VITA"; then
Expand Down

0 comments on commit f174a48

Please sign in to comment.