Skip to content

Commit

Permalink
Simplify installation with only 1 folder
Browse files Browse the repository at this point in the history
  • Loading branch information
sergiou87 committed Apr 28, 2019
1 parent c05e501 commit 72639b4
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 22 deletions.
6 changes: 5 additions & 1 deletion Makefile.switch
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ ARCH := -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE
CFLAGS := -g -Wall -O2 -ffunction-sections \
$(ARCH) $(DEFINES)

CFLAGS += -D__SWITCH__ $(INCLUDE) `sdl2-config --cflags` -DHAVE_SDL_MIXER "-DTRIPLANE_VERSION=\"$(APP_VERSION)\""
CFLAGS += -D__SWITCH__ $(INCLUDE) `sdl2-config --cflags` -DHAVE_SDL_MIXER "-DTRIPLANE_VERSION=\"$(APP_VERSION)\"" "-DTRIPLANE_DATA=\".\""

ifeq ($(DEBUG),1)
CFLAGS += -DDEBUG
endif

CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions

Expand Down
9 changes: 4 additions & 5 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,12 @@ $ make -f Makefile.switch
You need to put the following files in your SD card:
/ (root)
|
|-- triplane/
| |
| |-- fokker.dks
|
|-- switch/
|
|-- triplane-turmoil.nro
|-- triplane-turmoil
|
|-- triplane-turmoil.nro
|-- fokker.dks

Copyrights
==========
Expand Down
6 changes: 0 additions & 6 deletions src/io/dksfile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@
#include "util/wutil.h"
#include "io/dksfile.h"

#ifdef __SWITCH__
// Can't set this macro in the Makefile, mingw/msys keeps replacing the /
// with C:/mingw64 ¬_¬'
//
#define TRIPLANE_DATA "/triplane"
#endif
#define MAX_ENTRIES 8192

#pragma pack(1)
Expand Down
6 changes: 0 additions & 6 deletions src/settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,9 @@
#include <SDL.h>

#define MAX_PLAYERS_IN_ROSTER 150
#ifdef __SWITCH__
#define ROSTER_FILENAME "/triplane/roster.dta"
#define CONFIGURATION_FILENAME "/triplane/triplane.cfg"
#define KEYSET_FILENAME "/triplane/keyset.dta"
#else
#define ROSTER_FILENAME "roster.dta"
#define CONFIGURATION_FILENAME "triplane.cfg"
#define KEYSET_FILENAME "keyset.dta"
#endif

struct keymap {
SDL_Scancode up;
Expand Down
4 changes: 0 additions & 4 deletions src/triplane.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,7 @@

#define DKS_FILENAME "fokker.dks"

#ifdef __SWITCH__
#define CALIBRATION_FILENAME "/triplane/joystic.dta"
#else
#define CALIBRATION_FILENAME "joystic.dta"
#endif

//\ Picturedata

Expand Down

0 comments on commit 72639b4

Please sign in to comment.