mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-08-20 09:57:10 +00:00
fix: Compile fixes in both Minecraft.Client|World.
This commit is contained in:
parent
d6f88335e7
commit
ed614e0fa0
|
|
@ -5203,5 +5203,5 @@ elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Xbox 360")
|
||||||
"xonline"
|
"xonline"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
add_compile_options(-fpermissive)
|
||||||
target_link_libraries(${PROJECT_NAME} PRIVATE "${ADDITIONAL_LIBRARY_DEPENDENCIES}")
|
target_link_libraries(${PROJECT_NAME} PRIVATE "${ADDITIONAL_LIBRARY_DEPENDENCIES}")
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1988,3 +1988,4 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE
|
||||||
">"
|
">"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
add_compile_options(-fpermissive)
|
||||||
|
|
|
||||||
|
|
@ -9,8 +9,31 @@
|
||||||
#define AUTO_VAR(_var, _val) auto _var = _val
|
#define AUTO_VAR(_var, _val) auto _var = _val
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ( defined _XBOX || defined _WINDOWS64 || defined _DURANGO )
|
typedef unsigned __int64;
|
||||||
typedef unsigned __int64 __uint64;
|
typedef unsigned __uint64;
|
||||||
|
|
||||||
|
#if defined( __linux__ )
|
||||||
|
#include <cstring>
|
||||||
|
typedef unsigned int DWORD;
|
||||||
|
typedef const char *LPCSTR;
|
||||||
|
typedef bool BOOL;
|
||||||
|
typedef void* LPVOID;
|
||||||
|
typedef char WCHAR;
|
||||||
|
typedef unsigned char BYTE;
|
||||||
|
typedef BYTE* PBYTE;
|
||||||
|
typedef const wchar_t* LPCWSTR;
|
||||||
|
typedef unsigned long long ULONGLONG;
|
||||||
|
typedef int HRESULT;
|
||||||
|
typedef unsigned int UINT;
|
||||||
|
#define TRUE true
|
||||||
|
#define WINAPI
|
||||||
|
typedef void* HANDLE;
|
||||||
|
typedef int INT;
|
||||||
|
// From PSXSense
|
||||||
|
#define XUSER_MAX_COUNT 4
|
||||||
|
#define XUSER_INDEX_ANY 0x000000FF
|
||||||
|
|
||||||
|
#define CRITICAL_SECTION
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _WINDOWS64
|
#ifdef _WINDOWS64
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue