Renames pt1

Sumtin · Jul 18, 2021 · fb4467a · fb4467a
1 parent 6babb9c
commit fb4467a
Show file tree

Hide file tree

Showing 40 changed files with 63 additions and 63 deletions.
diff --git a/external/ALmixer/Isolated/ALmixer_RWops.c b/external/ALmixer/Isolated/ALmixer_RWops.c
@@ -97,7 +97,7 @@ ALmixer_RWops* ALmixer_RWFromFile(const char* file_name, const char* file_mode)
 /*		ALmixer_SetError("ALmixer_RWFromFile: No file or mode specified"); */
         return NULL;
     }
-#if defined(NINTENDO_LIB)
+#if defined(NXS_LIB)
 		file_pointer = fopen(file_name, file_mode);
 #elif defined(_WIN32) || defined(WINAPI_FAMILY)
 	{

diff --git a/external/ALmixer/Isolated/ALmixer_RWops.h b/external/ALmixer/Isolated/ALmixer_RWops.h
@@ -113,7 +113,7 @@ extern "C" {
 }
 #endif
 
-#ifdef NINTENDO_LIB
+#ifdef NXS_LIB
 #define fclose	nFileClose
 #define fopen	nFileOpen
 #define freopen	nFileReopen

diff --git a/external/ALmixer/Isolated/SimpleThreadPosix.c b/external/ALmixer/Isolated/SimpleThreadPosix.c
@@ -137,7 +137,7 @@ SimpleThread* SimpleThread_CreateThread(int (*user_function)(void*), void* user_
 
 size_t SimpleThread_GetCurrentThreadID()
 {
-#ifdef NINTENDO_LIB
+#ifdef NXS_LIB
 	return (size_t)pthread_self().p;
 #else
 	return (size_t)pthread_self();

diff --git a/external/ALmixer/Isolated/SoundDecoder.c b/external/ALmixer/Isolated/SoundDecoder.c
@@ -61,7 +61,7 @@ static SoundElement s_linkedDecoders[] =
 		{ 0, &__Sound_DecoderFunctions_CoreAudio },
 #else /* All other platforms. */
 #	if ( (defined(_WIN32) && !defined(WINAPI_FAMILY)) || (defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP)) && !defined(Rtt_ANDROID_ENV) )
-	#if (!defined(NINTENDO_LIB))
+	#if (!defined(NXS_LIB))
 		{ 0, &__Sound_DecoderFunctions_DirectX },
 	#endif
 #	endif

diff --git a/external/freetype-2.9 b/external/freetype-2.9
diff --git a/external/libjpeg/jconfig.h b/external/libjpeg/jconfig.h
@@ -18,7 +18,7 @@
  * EDIT A COPY NAMED JCONFIG.H.
  */
 
-#ifdef NINTENDO_LIB
+#ifdef NXS_LIB
 #define fclose	nFileClose
 #define fopen	nFileOpen
 #define freopen	nFileReopen

diff --git a/external/libjpeg/jmemansi.c b/external/libjpeg/jmemansi.c
@@ -141,7 +141,7 @@ GLOBAL(void)
 jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
 			 long total_bytes_needed)
 {
-#if defined(Rtt_NINTENDO_ENV)
+#if defined(Rtt_NXS_ENV)
   if ((info->temp_file = tmpfile()) == NULL)
     ERREXITS(cinfo, JERR_TFILE_CREATE, "");
 #endif

diff --git a/external/libpng1243b01/png.h b/external/libpng1243b01/png.h
@@ -3770,7 +3770,7 @@ PNG_EXTERN png_voidp png_calloc PNGARG((png_structp png_ptr,
 #endif /* PNG_VERSION_INFO_ONLY */
 
 
-#ifdef NINTENDO_LIB
+#ifdef NXS_LIB
 #define fclose	nFileClose
 #define fopen	nFileOpen
 #define freopen	nFileReopen

diff --git a/external/lua-5.1.3/src/loslib.c b/external/lua-5.1.3/src/loslib.c
@@ -36,7 +36,7 @@ static int os_pushresult (lua_State *L, int i, const char *filename) {
 
 
 static int os_execute (lua_State *L) {
-#if defined( Rtt_TVOS_ENV ) || defined( Rtt_IPHONE_ENV ) || defined( LUA_WIN_PHONE ) || defined(NINTENDO_LIB)
+#if defined( Rtt_TVOS_ENV ) || defined( Rtt_IPHONE_ENV ) || defined( LUA_WIN_PHONE ) || defined(NXS_LIB)
   return luaL_error(L, "execute() is not available on this platform");
 #else
   lua_pushinteger(L, system(luaL_optstring(L, 1, NULL)));
@@ -59,7 +59,7 @@ static int os_rename (lua_State *L) {
 
 
 static int os_tmpname (lua_State *L) {
-#if defined(NINTENDO_LIB)
+#if defined(NXS_LIB)
   return luaL_error(L, "unable to generate a unique filename");
 #else
   char buff[LUA_TMPNAMBUFSIZE];

diff --git a/external/lua-5.1.3/src/luaconf.h b/external/lua-5.1.3/src/luaconf.h
@@ -800,7 +800,7 @@ union luai_Cast { double l_d; long l_l; };
 ** without modifying the main part of the file.
 */
 
-#ifdef NINTENDO_LIB
+#ifdef NXS_LIB
 //#define FT_FILE     void
 //#define sprintf  sprintf
 //#define fclose	nFileClose

diff --git a/external/mpg123-1.13.1/src/libmpg123/config.h b/external/mpg123-1.13.1/src/libmpg123/config.h
@@ -16,7 +16,7 @@
 /* The size of `ssize_t', as computed by sizeof. */
 #define SIZEOF_SSIZE_T 4
 
-#ifdef NINTENDO_LIB
+#ifdef NXS_LIB
 	#include <sys/types.h>
 	#include <stdint.h>
 #endif

diff --git a/external/mpg123-1.13.1/src/libmpg123/mpg123.h b/external/mpg123-1.13.1/src/libmpg123/mpg123.h
@@ -29,7 +29,7 @@
 #endif
 
 #ifndef MPG123_NO_CONFIGURE /* Enable use of this file without configure. */
-#ifdef NINTENDO_LIB
+#ifdef NXS_LIB
 	#include "config.h"
 #else
 	//@INCLUDE_STDLIB_H@

diff --git a/external/openal-soft b/external/openal-soft
diff --git a/librtt/Core/Rtt_Assert.c b/librtt/Core/Rtt_Assert.c
@@ -192,7 +192,7 @@ Rtt_VLogException(const char *format, va_list ap)
 			}
 
 			// Output the string to stdout and the Visual Studio debugger.
-#if defined(Rtt_NINTENDO_ENV) || defined( Rtt_LINUX_ENV )
+#if defined(Rtt_NXS_ENV) || defined( Rtt_LINUX_ENV )
 			fputs(stringPointer, stdout);
 #elif defined(Rtt_WIN_PHONE_ENV)
 			if (fLogHandler)

diff --git a/librtt/Core/Rtt_Config.h b/librtt/Core/Rtt_Config.h
@@ -36,7 +36,7 @@
 #elif Rtt_ANDROID_ENV
 	#define Rtt_USE_OPENSLES
 	#define Rtt_USE_ALMIXER
-#elif Rtt_NINTENDO_ENV
+#elif Rtt_NXS_ENV
 	//#define Rtt_USE_ALMIXER
 #elif Rtt_LINUX_ENV
 	#define Rtt_USE_ALMIXER
@@ -353,7 +353,7 @@
 //
 // Nintendo 
 //
-#if defined( Rtt_NINTENDO_ENV )
+#if defined( Rtt_NXS_ENV )
 
 #define Rtt_USE_GLOBAL_VARIABLES
 #define Rtt_VPRINTF_SUPPORTED

diff --git a/librtt/Core/Rtt_Data.h b/librtt/Core/Rtt_Data.h
@@ -17,7 +17,7 @@
 
 #include <string.h>
 
-#if defined(Rtt_NINTENDO_ENV)
+#if defined(Rtt_NXS_ENV)
 #define Rtt_FREE( p )						free( (p) )
 #define Rtt_MALLOC( null, size )	malloc( (size) )
 #endif

diff --git a/librtt/Core/Rtt_FileSystem.cpp b/librtt/Core/Rtt_FileSystem.cpp
@@ -440,7 +440,7 @@ Rtt_EXPORT void* Rtt_FileMemoryMap(int fileDescriptor, size_t byteOffset, size_t
 				}
 			}
 		}
-#elif defined(Rtt_NINTENDO_ENV)
+#elif defined(Rtt_NXS_ENV)
 		return NULL;
 #else
 		int accessFlags = PROT_READ;

diff --git a/librtt/Core/Rtt_FileSystem.h b/librtt/Core/Rtt_FileSystem.h
@@ -59,7 +59,7 @@ size_t Rtt_WriteDataToFile(const char *filename, Rtt::Data<const unsigned char>
 std::vector<std::string> Rtt_ListFiles(const char *directoryName);
 
 	// wraper for NN file system
-	#if defined(Rtt_NINTENDO_ENV)
+	#if defined(Rtt_NXS_ENV)
 	#include <nn/fs.h>
 	struct nnFile
 	{

diff --git a/librtt/Core/Rtt_FixedBlockAllocator.cpp b/librtt/Core/Rtt_FixedBlockAllocator.cpp
@@ -63,7 +63,7 @@ Alloc( )
 		result = memalign( sysconf( _SC_PAGESIZE ), kSize );
 	#elif defined( Rtt_WEBOS_ENV ) || (defined( Rtt_EMSCRIPTEN_ENV ) && !defined(WIN32))
 		result = valloc( kSize );
-	#elif defined( Rtt_WIN_ENV ) || defined( Rtt_POWERVR_ENV ) || defined( Rtt_NINTENDO_ENV )
+	#elif defined( Rtt_WIN_ENV ) || defined( Rtt_POWERVR_ENV ) || defined( Rtt_NXS_ENV )
 		result = malloc( kSize );
 		// TODO: Need to return page-aligned memory block or else we'll crash
 		Rtt_ASSERT_NOT_IMPLEMENTED();

diff --git a/librtt/Core/Rtt_Real.h b/librtt/Core/Rtt_Real.h
@@ -16,7 +16,7 @@
 #include "Core/Rtt_Macros.h"
 #include "Core/Rtt_Fixed.h"
 
-#if defined( Rtt_WIN_ENV ) || defined( Rtt_POWERVR_ENV ) || defined( Rtt_NINTENDO_ENV )
+#if defined( Rtt_WIN_ENV ) || defined( Rtt_POWERVR_ENV ) || defined( Rtt_NXS_ENV )
 #define M_PI 3.1415926535897932384626f
 #endif
 

diff --git a/librtt/Core/Rtt_Time.h b/librtt/Core/Rtt_Time.h
@@ -14,7 +14,7 @@
 
 #include "Rtt_Macros.h"
 
-#if defined( Rtt_APPLE_ENV ) || defined( Rtt_ANDROID_ENV ) || defined( Rtt_WEBOS_ENV ) || defined( Rtt_EMSCRIPTEN_ENV ) || defined( Rtt_WIN_ENV ) || defined( Rtt_POWERVR_ENV ) || defined( Rtt_NINTENDO_ENV ) || defined( Rtt_LINUX_ENV )
+#if defined( Rtt_APPLE_ENV ) || defined( Rtt_ANDROID_ENV ) || defined( Rtt_WEBOS_ENV ) || defined( Rtt_EMSCRIPTEN_ENV ) || defined( Rtt_WIN_ENV ) || defined( Rtt_POWERVR_ENV ) || defined( Rtt_NXS_ENV ) || defined( Rtt_LINUX_ENV )
 	#include <stdint.h>
 	typedef uint64_t Rtt_AbsoluteTime;
 #elif defined( Rtt_SYMBIAN_ENV )

diff --git a/librtt/Core/Rtt_VersionTimestamp.c b/librtt/Core/Rtt_VersionTimestamp.c
@@ -29,7 +29,7 @@ Rtt_VersionTimestamp(void)
 	t.tm_mon = Rtt_BUILD_MONTH - 1; // months are 0-based (jan = 0)
 	t.tm_year = Rtt_BUILD_YEAR - 1900;
 	t.tm_isdst = 0;
-#if !defined( Rtt_WIN_ENV ) && !defined( Rtt_POWERVR_ENV ) && !defined( Rtt_NINTENDO_ENV )
+#if !defined( Rtt_WIN_ENV ) && !defined( Rtt_POWERVR_ENV ) && !defined( Rtt_NXS_ENV )
 	t.tm_gmtoff = 0;
 	t.tm_zone = NULL;
 #endif
@@ -40,7 +40,7 @@ Rtt_VersionTimestamp(void)
 	return mktime( & t );
 #elif defined( Rtt_WIN_ENV ) || defined( Rtt_POWERVR_ENV )
 	return Win_mktimeUTC(&t);
-#elif defined( Rtt_NINTENDO_ENV )
+#elif defined( Rtt_NXS_ENV )
 	return mktime(&t);
 #else
 	return timegm( & t );

diff --git a/librtt/Corona/CoronaMacros.h b/librtt/Corona/CoronaMacros.h
@@ -63,7 +63,7 @@
 
 // Windows uses different linkage visibility attributes that depend on whether
 // the declaration is used in the implementation or in a public header.
-#if (( defined( _WIN32 ) || defined( _WIN64 ) || defined( WINAPI_FAMILY ) ) && !defined(Rtt_ANDROID_ENV) && !defined(Rtt_NINTENDO_ENV) )
+#if (( defined( _WIN32 ) || defined( _WIN64 ) || defined( WINAPI_FAMILY ) ) && !defined(Rtt_ANDROID_ENV) && !defined(Rtt_NXS_ENV) )
 	#define CORONA_EXPORT					CORONA_EXTERN_C __declspec( dllexport )
 	#define CORONA_IMPORT					CORONA_EXTERN_C __declspec( dllimport )
 

diff --git a/librtt/Display/Rtt_Display.cpp b/librtt/Display/Rtt_Display.cpp
@@ -1618,7 +1618,7 @@ Display::WindowSizeChanged()
 			// need to be swapped to match the content w,h. 
 			S32 screenW = fTarget->DeviceWidth();
 			S32 screenH = fTarget->DeviceHeight();
-#if defined(Rtt_WIN_ENV) || defined(Rtt_NINTENDO_ENV)
+#if defined(Rtt_WIN_ENV) || defined(Rtt_NXS_ENV)
 			Rtt::DeviceOrientation::Type orientation = GetContentOrientation();
 #else
 			//TODO: Determine if we can do this the above Windows way on all platforms.
@@ -1708,7 +1708,7 @@ Display::GetElapsedTime() const
 void
 Display::GetViewProjectionMatrix(glm::mat4 &viewMatrix, glm::mat4 &projMatrix)
 {
-#if defined(Rtt_WIN_ENV) || defined(EMSCRIPTEN) || defined( Rtt_NINTENDO_ENV )
+#if defined(Rtt_WIN_ENV) || defined(EMSCRIPTEN) || defined( Rtt_NXS_ENV )
 	viewMatrix = glm::lookAt( glm::vec3( 0.0, 0.0, 0.5 ),
 								glm::vec3( 0.0, 0.0, 0.0 ),
 								glm::vec3( 0.0, 1.0, 0.0 ) );

diff --git a/librtt/Display/Rtt_PlatformBitmapTexture.cpp b/librtt/Display/Rtt_PlatformBitmapTexture.cpp
@@ -77,7 +77,7 @@ PlatformBitmapTexture::ConvertFormat( PlatformBitmap::Format format )
 			// the gray value across all 4 channels. Compare:
 			// * Luminance: (a,a,a,a)
 			// * Alpha:     (0,0,0,a)
-#if defined(Rtt_NINTENDO_ENV) || defined(Rtt_LINUX_ENV)
+#if defined(Rtt_NXS_ENV) || defined(Rtt_LINUX_ENV)
 			// NN SDK does not support Luminance & Alpha.. weird
 			result = Texture::kRGBA;
 #else

diff --git a/librtt/Display/Rtt_TextureFactory.cpp b/librtt/Display/Rtt_TextureFactory.cpp
@@ -399,7 +399,7 @@ TextureFactory::SetVideoSource( VideoSource source )
 static BufferBitmap *
 NewContainerMaskBitmap( Rtt_Allocator *pAllocator )
 {
-#if defined(Rtt_NINTENDO_ENV) || defined(Rtt_LINUX_ENV)
+#if defined(Rtt_NXS_ENV) || defined(Rtt_LINUX_ENV)
 	const size_t kLength = 8;
 	const size_t kBorder = 2;
 	const PlatformBitmap::Format kFormat = PlatformBitmap::kRGBA;

diff --git a/librtt/Renderer/Rtt_GL.h b/librtt/Renderer/Rtt_GL.h
@@ -25,7 +25,7 @@
 	#elif defined( Rtt_POWERVR_ENV )
 		#include <GLES/egl.h>
 		#include <GLES/gl.h>
-	#elif defined(Rtt_NINTENDO_ENV)
+	#elif defined(Rtt_NXS_ENV)
 		#include <GLES2/gl2.h>
 		#include <GLES2/gl2ext.h>
 		#include <GLES2/gl2ext_nv.h>
@@ -43,7 +43,7 @@
 #elif defined( Rtt_WIN_ENV )
 	#define WIN32_LEAN_AND_MEAN
 	#include <GL/glew.h>
-#elif defined(Rtt_NINTENDO_ENV)
+#elif defined(Rtt_NXS_ENV)
 	#include "../../platform/switch/Solar2D/Rtt_NX_GL.h"
 #else
 	#include <OpenGL/gl.h>

diff --git a/librtt/Rtt_Archive.cpp b/librtt/Rtt_Archive.cpp
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <fcntl.h>
 
-#if defined( Rtt_WIN_ENV ) || defined( Rtt_POWERVR_ENV ) // || defined( Rtt_NINTENDO_ENV )
+#if defined( Rtt_WIN_ENV ) || defined( Rtt_POWERVR_ENV ) // || defined( Rtt_NXS_ENV )
 	#include <io.h>
 	#include <sys/stat.h>
 	static const unsigned S_IRUSR = _S_IREAD;     ///< read by user
@@ -973,7 +973,7 @@ Archive::Archive( Rtt_Allocator& allocator, const char *srcPath )
 #endif
 	fData( NULL )
 {
-#if defined( Rtt_WIN_PHONE_ENV ) || defined(Rtt_NINTENDO_ENV)
+#if defined( Rtt_WIN_PHONE_ENV ) || defined(Rtt_NXS_ENV)
 	FILE* filePointer = Rtt_FileOpen(srcPath, "rb");
 	if (filePointer)
 	{
@@ -1107,7 +1107,7 @@ Archive::Archive( Rtt_Allocator& allocator, const char *srcPath )
 
 Archive::~Archive()
 {
-#if defined( Rtt_ANDROID_ENV ) || defined( Rtt_EMSCRIPTEN_ENV ) || defined( Rtt_NINTENDO_ENV )
+#if defined( Rtt_ANDROID_ENV ) || defined( Rtt_EMSCRIPTEN_ENV ) || defined( Rtt_NXS_ENV )
 	// Do nothing.
 #elif defined( Rtt_WIN_PHONE_ENV )
 	Rtt_FREE((void*)fData);

diff --git a/librtt/Rtt_GPU.h b/librtt/Rtt_GPU.h
@@ -27,7 +27,7 @@
 	#else
 		#error TODO: Add path to gl.h header
 	#endif
-#elif defined( Rtt_LINUX_ENV ) || defined( Rtt_NINTENDO_ENV )
+#elif defined( Rtt_LINUX_ENV ) || defined( Rtt_NXS_ENV )
 	#ifdef _WIN32
 		#include <windows.h>
 		#include <GL/glew.h>

diff --git a/librtt/Rtt_GPUStream.cpp b/librtt/Rtt_GPUStream.cpp
@@ -1479,7 +1479,7 @@ GPUStream::CaptureFrameBuffer( BufferBitmap& outBuffer, S32 xScreen, S32 yScreen
 	GLenum kType = GPU_GetPixelType( format );
 #endif
 
-#if defined(Rtt_NINTENDO_ENV)
+#if defined(Rtt_NXS_ENV)
 	Rtt_ASSERT(0 && "glReadPixels: TODO");
 #else
 	glReadPixels( xScreen,

diff --git a/librtt/Rtt_Lua.cpp b/librtt/Rtt_Lua.cpp
@@ -802,13 +802,13 @@ Lua::DoCall( lua_State* L, int narg, int nresults )
 
 	sLuaContext = L;
 
-#if !defined(EMSCRIPTEN) && !defined(Rtt_NINTENDO_ENV)
+#if !defined(EMSCRIPTEN) && !defined(Rtt_NXS_ENV)
 	signal(SIGINT, LuaAction);
 #endif
 
     int status = lua_pcall(L, narg, nresults, errfunc);
 
-#if !defined(EMSCRIPTEN) && !defined(Rtt_NINTENDO_ENV)
+#if !defined(EMSCRIPTEN) && !defined(Rtt_NXS_ENV)
 	signal(SIGINT, SIG_DFL);
 #endif
 

diff --git a/librtt/Rtt_LuaContext.cpp b/librtt/Rtt_LuaContext.cpp
@@ -92,7 +92,7 @@ extern "C" {
 }
 #endif
 
-#ifdef Rtt_NINTENDO_ENV
+#ifdef Rtt_NXS_ENV
 	int luaopen_network(lua_State* L);
 #endif
 
@@ -103,7 +103,7 @@ namespace Rtt
 	void LuaLibWebAudio_Initialize(lua_State* L);
 #endif
 
-#ifdef Rtt_NINTENDO_ENV
+#ifdef Rtt_NXS_ENV
 	int luaload_nnTextField(lua_State* L);
 	int luaload_nnTextBox(lua_State* L);
 	int luaload_nnNativeAlert(lua_State* L);
@@ -618,7 +618,7 @@ LuaContext::InitializeLuaPath( lua_State* L, const MPlatform& platform )
 	//      "?.dll" .. ";" .. system.pathForFile( system.SystemResourceDirectory ) .. "/?.dll"
 	//
 	// NOTE: Assumes C modules reside in system resource directory
-#if defined(Rtt_NINTENDO_ENV)
+#if defined(Rtt_NXS_ENV)
 	lua_pushfstring(L,
 		"%s" LUA_DIRSEP LUA_PATH_MARK "." Rtt_LUA_C_MODULE_FILE_EXTENSION LUA_PATHSEP,
 		absoluteBase.GetString());
@@ -804,7 +804,7 @@ LuaContext::InitializeLuaCore( lua_State* L )
 		{ "ltn12", Lua::Open< CoronaPluginLuaLoad_ltn12 > },
 #endif
 
-#if defined(Rtt_NINTENDO_ENV)
+#if defined(Rtt_NXS_ENV)
 		{ "network", luaopen_network },
 		{ "nnTextField", Lua::Open< luaload_nnTextField > },
 		{ "nnTextBox", Lua::Open< luaload_nnTextBox > },
@@ -913,14 +913,14 @@ LuaContext::DoCall( lua_State* L, int narg, int nresults )
 		errfunc = base;
 	}
 
-#if (defined( Rtt_DEBUG ) || defined( Rtt_DEBUGGER )) && !defined(EMSCRIPTEN) && !defined(Rtt_NINTENDO_ENV)
+#if (defined( Rtt_DEBUG ) || defined( Rtt_DEBUGGER )) && !defined(EMSCRIPTEN) && !defined(Rtt_NXS_ENV)
 	signal(SIGINT, laction);
 #endif
 
 	// The actual call
 	int status = lua_pcall(L, narg, nresults, errfunc);
 
-#if (defined( Rtt_DEBUG ) || defined( Rtt_DEBUGGER )) && !defined(EMSCRIPTEN) && !defined(Rtt_NINTENDO_ENV)
+#if (defined( Rtt_DEBUG ) || defined( Rtt_DEBUGGER )) && !defined(EMSCRIPTEN) && !defined(Rtt_NXS_ENV)
 	signal(SIGINT, SIG_DFL);
 #endif
+1 −1		Alc/alc.cpp
+1 −1		Alc/alconfig.cpp
+1 −1		Alc/helpers.cpp
+2 −2		OpenAL32/alError.cpp