ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

get rid of DC_PLATFORM and build flavors

This commit is contained in:
Flyinghead 2019-07-11 19:55:03 +02:00
parent eb38564922
commit 4884dbc400
5 changed files with 4 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/build.h
View File

@ -227,11 +227,6 @@
#error Invalid Target: TARGET_* not defined
#endif
#if defined(TARGET_NAOMI)
#define DC_PLATFORM DC_PLATFORM_NAOMI
#undef TARGET_NAOMI
#endif
#if defined(TARGET_NO_REC)
#define FEAT_SHREC DYNAREC_NONE
#define FEAT_AREC DYNAREC_NONE
@ -267,10 +262,6 @@
//defaults
#ifndef DC_PLATFORM
#define DC_PLATFORM DC_PLATFORM_DREAMCAST
#endif
#ifndef FEAT_SHREC
#define FEAT_SHREC DYNAREC_JIT
#endif

13
core/types.h
View File

@ -339,18 +339,7 @@ using namespace std;
#endif
#if DC_PLATFORM==DC_PLATFORM_DREAMCAST
#define VER_EMUNAME "Flycast"
#elif DC_PLATFORM==DC_PLATFORM_DEV_UNIT
#define VER_EMUNAME "Flycast-DevKit-SET5.21"
#elif DC_PLATFORM==DC_PLATFORM_NAOMI
#define VER_EMUNAME "Flycast-Naomi"
#elif DC_PLATFORM==DC_PLATFORM_ATOMISWAVE
#define VER_EMUNAME "Flycast-AtomisWave"
#else
#error unknown target platform
#endif
#define VER_EMUNAME "Flycast"
#define VER_FULLNAME VER_EMUNAME " git" _X_x_X_MMU_VER_STR " (built " __DATE__ "@" __TIME__ ")"
#define VER_SHORTNAME VER_EMUNAME " git" _X_x_X_MMU_VER_STR

5
shell/android-studio/reicast/build.gradle
View File

@ -71,11 +71,6 @@ android {
productFlavors {
dreamcast {
}
naomi {
applicationId = "com.flycast.emulator.naomi"
versionNameSuffix " Naomi"
externalNativeBuild { ndkBuild { arguments "NAOMI=1" } }
}
}
externalNativeBuild {

8
shell/cmake/config.cmake
View File

@ -311,14 +311,6 @@ set(CMAKE_C_FLAGS " ${_C_FLAGS}") # ${CMAKE_C_FLAGS} -- these hold default VC
set(CMAKE_CXX_FLAGS " ${_CXX_FLAGS}") # ${CMAKE_CXX_FLAGS}
#if defined(TARGET_NAOMI)
#define DC_PLATFORM DC_PLATFORM_NAOMI
#undef TARGET_NAOMI
#endif
#if defined(TARGET_NO_NIXPROF)
#define FEAT_HAS_NIXPROF 0
#endif

23
shell/linux/Makefile
View File

@ -400,26 +400,9 @@ ifdef DEBUGFAST
endif
EXECUTABLE_STRIPPED=nosym-reicast.$(PLATFORM_EXT)
ifdef NAOMI
CFLAGS += -D TARGET_NAOMI
DC_PLATFORM=naomi
EXECUTABLE=reicast_naomi.$(PLATFORM_EXT)
EXECUTABLE_NAME=reicast-naomi
else ifdef ATOMISWAVE
CFLAGS += -D DC_PLATFORM=DC_PLATFORM_ATOMISWAVE
DC_PLATFORM=atomiswave
EXECUTABLE=reicast_awave.$(PLATFORM_EXT)
EXECUTABLE_NAME=reicast-awave
else ifdef DISPFRAME
CFLAGS += -D TARGET_DISPFRAME #-D TARGET_NAOMI
DC_PLATFORM=dispframe
EXECUTABLE=dispframe.$(PLATFORM_EXT)
EXECUTABLE_NAME=dispframe
else
DC_PLATFORM=dreamcast
EXECUTABLE=reicast.$(PLATFORM_EXT)
EXECUTABLE_NAME=reicast
endif
DC_PLATFORM=dreamcast
EXECUTABLE=reicast.$(PLATFORM_EXT)
EXECUTABLE_NAME=reicast
ifndef NOT_ARM
AS=${CC_PREFIX}gcc