Branimir Karadžić 9 lat temu
rodzic
commit
1cc34ea3cf

+ 1 - 0
include/bx/config.h

@@ -28,6 +28,7 @@
 #	define BX_CONFIG_CRT_PROCESS !(0 \
 			|| BX_PLATFORM_EMSCRIPTEN \
 			|| BX_PLATFORM_NACL \
+			|| BX_PLATFORM_PS4 \
 			|| BX_PLATFORM_WINRT \
 			|| BX_PLATFORM_XBOXONE \
 			)

+ 17 - 0
include/bx/crtimpl.h

@@ -82,6 +82,23 @@ namespace bx
 #endif // BX_CONFIG_ALLOCATOR_CRT
 
 #if BX_CONFIG_CRT_FILE_READER_WRITER
+
+#	if BX_CRT_MSVC
+#		define fseeko64 _fseeki64
+#		define ftello64 _ftelli64
+#	elif 0 \
+	  || BX_PLATFORM_ANDROID \
+	  || BX_PLATFORM_BSD \
+	  || BX_PLATFORM_IOS \
+	  || BX_PLATFORM_OSX \
+	  || BX_PLATFORM_QNX
+#		define fseeko64 fseeko
+#		define ftello64 ftello
+#	elif BX_PLATFORM_PS4
+#		define fseeko64 fseek
+#		define ftello64 ftell
+#	endif // BX_
+
 	class CrtFileReader : public FileReaderI
 	{
 	public:

+ 0 - 8
include/bx/readerwriter.h

@@ -16,14 +16,6 @@
 #include "error.h"
 #include "uint32_t.h"
 
-#if BX_CRT_MSVC
-#	define fseeko64 _fseeki64
-#	define ftello64 _ftelli64
-#elif BX_PLATFORM_ANDROID || BX_PLATFORM_BSD || BX_PLATFORM_IOS || BX_PLATFORM_OSX || BX_PLATFORM_QNX
-#	define fseeko64 fseeko
-#	define ftello64 ftello
-#endif // BX_
-
 BX_ERROR_RESULT(BX_ERROR_READERWRITER_OPEN,  BX_MAKEFOURCC('R', 'W', 0, 1) );
 BX_ERROR_RESULT(BX_ERROR_READERWRITER_READ,  BX_MAKEFOURCC('R', 'W', 0, 2) );
 BX_ERROR_RESULT(BX_ERROR_READERWRITER_WRITE, BX_MAKEFOURCC('R', 'W', 0, 3) );

+ 1 - 0
include/compat/freebsd/dirent.h

@@ -0,0 +1 @@
+#include <sys/dirent.h>

+ 5 - 5
scripts/toolchain.lua

@@ -360,11 +360,11 @@ function toolchain(_buildDir, _libDir)
 
 		elseif "ps4" == _OPTIONS["gcc"] then
 
-			if not os.getenv("PS4_SDK_ROOT") then
-				print("Set PS4_SDK_ROOT enviroment variable.")
+			if not os.getenv("SCE_ROOT_DIR") then
+				print("Set SCE_ROOT_DIR enviroment variable.")
 			end
 
-			ps4Toolchain = "$(PS4_SDK_ROOT)/host_tools/bin/orbis-"
+			ps4Toolchain = "$(SCE_ROOT_DIR)/host_tools/bin/orbis-"
 
 			premake.gcc.cc  = ps4Toolchain .. "clang"
 			premake.gcc.cxx = ps4Toolchain .. "clang++"
@@ -1168,8 +1168,8 @@ function toolchain(_buildDir, _libDir)
 		libdirs { path.join(_libDir, "lib/ps4") }
 		includedirs {
 			path.join(bxDir, "include/compat/freebsd"),
-			"$(PS4_SDK_ROOT)/target/include",
-			"$(PS4_SDK_ROOT)/target/include_common",
+			"$(SCE_ROOT_DIR)/target/include",
+			"$(SCE_ROOT_DIR)/target/include_common",
 		}
 		buildoptions {
 		}