Cleanup. Change _3DS to __3DS__ and PSP2 to __vita__

.gitignore

@@ -110,3 +110,17 @@ local.properties
 
 # libretro
 easyrpg_libretro.*
+
+# switch
+*.nacp
+*.nro
+
+# 3ds
+*.3dsx
+*.smdh
+*.cia
+
+# psvita
+eboot.bin
+*.vpk
+*.velf

CMakeLists.txt

@@ -549,18 +549,6 @@ if(${PLAYER_TARGET_PLATFORM} MATCHES "^(3ds|psvita|switch)$")
 	set(PLAYER_ENABLE_TESTS OFF)
 endif()
 
-# These are shared by libretro and native builds
-if(N3DS)
-	# fixme: libretro
-	target_compile_definitions(${PROJECT_NAME} PUBLIC __3DS__)
-elseif(VITA)
-	# fixme: better use __vita__, as defined by preprocessor
-	target_compile_definitions(${PROJECT_NAME} PUBLIC PSP2)
-elseif(NSWITCH)
-	# fixme: libretro
-	target_compile_definitions(${PROJECT_NAME} PUBLIC __SWITCH__)
-endif()
-
 if(NOT PLAYER_BUILD_EXECUTABLE AND BUILD_SHARED_LIBS)
 	# Need fPIC when compiling a shared library (e.g. libretro.so)
 	set(CMAKE_POSITION_INDEPENDENT_CODE ON)

resources/psvita/vpk_builder/build/sce_sys/livearea/contents/template.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<livearea style="a1" format-ver="01.00" content-rev="1">
+	<livearea-background>
+		<image>bg.png</image>
+	</livearea-background>
+
+	<gate>
+		<startup-image>startup.png</startup-image>
+	</gate>
+
+	<frame id="frame3">
+		<liveitem>
+			<text valign="bottom" text-valign="bottom" align="right" text-align="right"  line-space="3" ellipsis="on">
+				<str color="#ffffff" size="16" bold="on" shadow="on">powered by EasyRPG</str>
+			</text>
+		</liveitem>
+	</frame>
+
+</livearea>

src/audio_midi.h

@@ -22,7 +22,7 @@ class AudioDecoderMidi;
 
 #include "audio_decoder_base.h"
 
-#if defined(GEKKO) || defined(_3DS)
+#if defined(GEKKO) || defined(__3DS__)
 #  define EP_MIDI_FREQ 22050
 #else
 #  define EP_MIDI_FREQ 44100

src/baseui.cpp

@@ -25,9 +25,9 @@
 #  include "sdl_ui.h"
 #elif USE_LIBRETRO
 #  include "platform/libretro/libretro_ui.h"
-#elif defined(_3DS)
+#elif defined(__3DS__)
 #  include "platform/3ds/3ds_ui.h"
-#elif defined(PSP2)
+#elif defined(__vita__)
 #  include "platform/psvita/psp2_ui.h"
 #elif defined(__SWITCH__)
 #  include "platform/switch/switch_ui.h"
@@ -42,9 +42,9 @@ std::shared_ptr<BaseUi> BaseUi::CreateUi(long width, long height, const Game_Con
 	return std::make_shared<SdlUi>(width, height, cfg);
 #elif defined(USE_LIBRETRO)
 	return std::make_shared<LibretroUi>(width, height, cfg);
-#elif defined(_3DS)
+#elif defined(__3DS__)
 	return std::make_shared<CtrUi>(width, height, cfg);
-#elif defined(PSP2)
+#elif defined(__vita__)
 	return std::make_shared<Psp2Ui>(width, height, cfg);
 #elif defined(__SWITCH__)
 	return std::make_shared<NxUi>(width, height, cfg);

src/decoder_wildmidi.cpp

@@ -161,7 +161,7 @@ bool WildMidiDecoder::Initialize(std::string& error_message) {
 		config_file = "timidity.cfg";
 		found = FileFinder::Root().Exists(config_file);
 	}
-#elif defined(_3DS)
+#elif defined(__3DS__)
 	// Only wildmidi paths, no timidity because there was never timidity used on 3DS
 
 	// Shipped in a romfs (for CIA and newer 3dsx files)
@@ -200,7 +200,7 @@ bool WildMidiDecoder::Initialize(std::string& error_message) {
 		config_file = path + "/timidity.cfg";
 		found = FileFinder::Root().Exists(config_file);
 	}
-#elif defined(PSP2)
+#elif defined(__vita__)
 	// Only wildmidi paths, no timidity because it was never used on PSVita
 
 	// Shipped

src/decoder_xmp.cpp

@@ -87,7 +87,7 @@ bool XMPDecoder::Open(Filesystem_Stream::InputStream stream) {
 
 	int player_interpolation = 0;
 	int player_effects = 0;
-#if defined(PSP) || defined(_3DS) || defined(GEKKO)
+#if defined(PSP) || defined(__3DS__) || defined(GEKKO)
 	// disable filtering and use low quality interpolation
 	player_interpolation = XMP_INTERP_NEAREST;
 #else

src/filefinder_rtp.cpp

@@ -54,10 +54,10 @@ FileFinder_RTP::FileFinder_RTP(bool no_rtp, bool no_rtp_warnings, std::string rt
 #elif defined(__SWITCH__)
 	AddPath("./rtp/" + version_str);
 	AddPath("/switch/easyrpg-player/rtp/" + version_str);
-#elif defined(_3DS)
+#elif defined(__3DS__)
 	AddPath("romfs:/data/rtp/" + version_str);
 	AddPath("sdmc:/data/rtp/" + version_str);
-#elif defined(PSP2)
+#elif defined(__vita__)
 	AddPath("ux0:/data/easyrpg-player/rtp/" + version_str);
 #elif defined(USE_LIBRETRO)
 	const char* dir = nullptr;

src/main_data.cpp

@@ -45,10 +45,10 @@
 #if defined(USE_SDL) && defined(__ANDROID__)
 #  include <jni.h>
 #  include <SDL_system.h>
-#elif defined(_3DS)
+#elif defined(__3DS__)
 #  include <3ds.h>
 #  include <cstdio>
-#elif defined(PSP2)
+#elif defined(__vita__)
 #  include <cstdio>
 #  include <psp2/io/stat.h>
 #elif defined(__APPLE__) && TARGET_OS_OSX
@@ -92,7 +92,7 @@ void Main_Data::Init() {
 			char working_dir[256];
 			getcwd(working_dir, 255);
 			project_path = std::string(working_dir);
-#elif defined(PSP2)
+#elif defined(__vita__)
 			// Check if app0 filesystem contains the title id reference file
 			FILE* f = fopen("app0:/titleid.txt","r");
 			if (f == NULL)
@@ -113,7 +113,7 @@ void Main_Data::Init() {
 				}
 				FileFinder::SetSaveFilesystem(savefs);
 			}
-#elif defined(_3DS)
+#elif defined(__3DS__)
 			// Check if romFs has some files inside or not
 			FILE* testfile = fopen("romfs:/RPG_RT.lmt","r");
 			if (testfile != NULL) {

src/output.cpp

@@ -334,7 +334,7 @@ void Output::ErrorStr(std::string const& err) {
 		std::cout << err << std::endl;
 		std::cout << std::endl;
 		std::cout << "EasyRPG Player will close now.";
-#if defined (GEKKO) || defined(__SWITCH__) || defined(_3DS)
+#if defined (GEKKO) || defined(__SWITCH__) || defined(__3DS__)
 		// stdin is non-blocking
 		Game_Clock::SleepFor(5s);
 #elif defined (EMSCRIPTEN)

src/platform.cpp

@@ -45,10 +45,10 @@ Platform::File::File(std::string name) :
 bool Platform::File::Exists() const {
 #ifdef _WIN32
 	return ::GetFileAttributesW(filename.c_str()) != (DWORD)-1;
-#elif (defined(GEKKO) || defined(_3DS) || defined(__SWITCH__))
+#elif (defined(GEKKO) || defined(__3DS__) || defined(__SWITCH__))
 	struct stat sb;
 	return ::stat(filename.c_str(), &sb) == 0;
-#elif defined(PSP2)
+#elif defined(__vita__)
 	struct SceIoStat sb;
 	return (::sceIoGetstat(filename.c_str(), &sb) >= 0);
 #else
@@ -77,7 +77,7 @@ Platform::FileType Platform::File::GetType(bool follow_symlinks) const {
 		return FileType::Directory;
 	}
 	return FileType::Other;
-#elif defined(PSP2)
+#elif defined(__vita__)
 	(void)follow_symlinks;
 	struct SceIoStat sb = {};
 	if (::sceIoGetstat(filename.c_str(), &sb) >= 0) {
@@ -88,7 +88,7 @@ Platform::FileType Platform::File::GetType(bool follow_symlinks) const {
 	return FileType::Unknown;
 #else
 	struct stat sb = {};
-#  if (defined(GEKKO) || defined(_3DS) || defined(__SWITCH__))
+#  if (defined(GEKKO) || defined(__3DS__) || defined(__SWITCH__))
 	(void)follow_symlinks;
 	auto fn = ::stat;
 #  else
@@ -114,7 +114,7 @@ int64_t Platform::File::GetSize() const {
 	}
 
 	return ((int64_t)data.nFileSizeHigh << 32) | (int64_t)data.nFileSizeLow;
-#elif defined(PSP2)
+#elif defined(__vita__)
 	struct SceIoStat sb = {};
 	int result = ::sceIoGetstat(filename.c_str(), &sb);
 	return (result >= 0) ? (int64_t)sb.st_size : (int64_t)-1;
@@ -155,7 +155,7 @@ bool Platform::File::MakeDirectory(bool follow_symlinks) const {
 				return false;
 			}
 #else
-#  if defined(PSP2)
+#  if defined(__vita__)
 			int res = sceIoMkdir(cur_path.c_str(), 0777);
 #  else
 			int res = mkdir(cur_path.c_str(), 0777);
@@ -172,7 +172,7 @@ bool Platform::File::MakeDirectory(bool follow_symlinks) const {
 Platform::Directory::Directory(const std::string& name) {
 #if defined(_WIN32)
 	dir_handle = ::_wopendir(Utils::ToWideString(name.empty() ? "." : name).c_str());
-#elif defined(PSP2)
+#elif defined(__vita__)
 	dir_handle = ::sceIoDopen(name.empty() ? "." : name.c_str());
 #else
 	dir_handle = ::opendir(name.empty() ? "." : name.c_str());
@@ -184,7 +184,7 @@ Platform::Directory::~Directory() {
 }
 
 bool Platform::Directory::Read() {
-#if defined(PSP2)
+#if defined(__vita__)
 	assert(dir_handle >= 0);
 
 	valid_entry = ::sceIoDread(dir_handle, &entry) > 0;
@@ -206,7 +206,7 @@ bool Platform::Directory::Read() {
 std::string Platform::Directory::GetEntryName() const {
 	assert(valid_entry);
 
-#if defined(PSP2)
+#if defined(__vita__)
 	return entry.d_name;
 #elif defined(_WIN32)
 	return Utils::FromWideString(entry->d_name);
@@ -215,7 +215,7 @@ std::string Platform::Directory::GetEntryName() const {
 #endif
 }
 
-#ifndef PSP2
+#ifndef __vita__
 static inline Platform::FileType GetEntryType(...) {
 	return Platform::FileType::Unknown;
 }
@@ -231,7 +231,7 @@ static inline Platform::FileType GetEntryType(T* entry) {
 Platform::FileType Platform::Directory::GetEntryType() const {
 	assert(valid_entry);
 
-#if defined(PSP2)
+#if defined(__vita__)
 	return SCE_S_ISREG(entry.d_stat.st_mode) ? FileType::File :
 			SCE_S_ISDIR(entry.d_stat.st_mode) ? FileType::Directory : FileType::Other;
 #else
@@ -244,7 +244,7 @@ void Platform::Directory::Close() {
 #if defined(_WIN32)
 		::_wclosedir(dir_handle);
 		dir_handle = nullptr;
-#elif defined(PSP2)
+#elif defined(__vita__)
 		::sceIoDclose(dir_handle);
 		dir_handle = -1;
 #else

src/platform.h

@@ -31,7 +31,7 @@
 #    include "dirent_win.h"
 #  endif
 #else
-#  ifdef PSP2
+#  ifdef __vita__
 #    include <psp2/io/dirent.h>
 #    include <psp2/io/stat.h>
 #  else
@@ -149,7 +149,7 @@ namespace Platform {
 #if defined(_WIN32)
 		_WDIR* dir_handle = nullptr;
 		struct _wdirent* entry = nullptr;
-#elif defined(PSP2)
+#elif defined(__vita__)
 		int dir_handle = -1;
 		struct SceIoDirent entry = {};
 #else
@@ -160,7 +160,7 @@ namespace Platform {
 	};
 
 	inline Directory::operator bool() const noexcept {
-#ifdef PSP2
+#ifdef __vita__
 		return dir_handle >= 0;
 #else
 		return dir_handle != nullptr;

src/platform/3ds/3ds_audio.cpp

@@ -15,7 +15,7 @@
  * along with EasyRPG Player. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if defined(_3DS) && defined(SUPPORT_AUDIO)
+#ifdef SUPPORT_AUDIO
 
 #include <cstring>
 

src/platform/3ds/3ds_audio.h

@@ -20,7 +20,6 @@
 
 #include "audio.h"
 
-#ifdef _3DS
 #include <3ds.h>
 #include <3ds/synchronization.h>
 #include <memory>
@@ -65,5 +64,3 @@ class CtrAudio : public AudioInterface {
 }; // class CtrAudio
 
 #endif
-
-#endif

src/platform/3ds/3ds_clock.cpp

@@ -14,9 +14,8 @@
  * You should have received a copy of the GNU General Public License
  * along with EasyRPG Player. If not, see <http://www.gnu.org/licenses/>.
  */
+
 #include "3ds_clock.h"
 
-#ifdef _3DS
 constexpr bool CtrClock::is_steady;
 constexpr int64_t CtrClock::ticks_per_sec;
-#endif

src/platform/3ds/3ds_clock.h

@@ -18,8 +18,6 @@
 #ifndef EP_PLATFORM_3DS_CLOCK_H
 #define EP_PLATFORM_3DS_CLOCK_H
 
-#ifdef _3DS
-
 #include <3ds.h>
 #include <cstdint>
 #include <chrono>
@@ -58,4 +56,3 @@ constexpr const char* CtrClock::Name() {
 }
 
 #endif
-#endif

src/platform/3ds/3ds_ui.cpp

@@ -15,8 +15,6 @@
  * along with EasyRPG Player. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifdef _3DS
-
 // Headers
 #include "3ds_ui.h"
 #include "color.h"
@@ -333,5 +331,3 @@ void CtrUi::SetTitle(const std::string& /* title */) {
 bool CtrUi::ShowCursor(bool /* flag */) {
 	return true;
 }
-
-#endif

src/platform/3ds/3ds_ui.h

@@ -18,8 +18,6 @@
 #ifndef EP_PLATFORM_3DS_UI_H
 #define EP_PLATFORM_3DS_UI_H
 
-#ifdef _3DS
-
 // Headers
 #include "baseui.h"
 #include "color.h"
@@ -79,5 +77,3 @@ class CtrUi : public BaseUi {
 };
 
 #endif
-
-#endif