diff --git a/CMakeLists.txt b/CMakeLists.txt index f07224ee5d..da6bc210cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL Linux) set(CMAKE_INSTALL_RPATH "$ORIGIN") set(CMAKE_BUILD_RPATH "$ORIGIN") elseif (APPLE) - add_compile_options(-Wno-declaration-after-statement) + add_compile_options(-Wno-declaration-after-statement -Wno-non-pod-varargs) set(CMAKE_INSTALL_RPATH "$ORIGIN") set(CMAKE_BUILD_RPATH "$ORIGIN") elseif (MSVC) diff --git a/src/JSystem/J3DGraphBase/J3DShape.cpp b/src/JSystem/J3DGraphBase/J3DShape.cpp index 1839aa08e3..c146a0d4ff 100644 --- a/src/JSystem/J3DGraphBase/J3DShape.cpp +++ b/src/JSystem/J3DGraphBase/J3DShape.cpp @@ -2,7 +2,9 @@ #include "JSystem/J3DGraphBase/J3DShape.h" +#if !__APPLE__ #include +#endif #include #include "JSystem/J3DGraphBase/J3DFifo.h" diff --git a/src/JSystem/JAudio2/JASDSPInterface.cpp b/src/JSystem/JAudio2/JASDSPInterface.cpp index d033e8b0de..f777865186 100644 --- a/src/JSystem/JAudio2/JASDSPInterface.cpp +++ b/src/JSystem/JAudio2/JASDSPInterface.cpp @@ -456,7 +456,7 @@ int JASDsp::setFXLine(u8 param_0, s16* buffer, JASDsp::FxlineConfig_* param_2) { u32 bufsize = param_2->field_0xc * 0xa0; puVar3->field_0x4 = buffer; JASCalc::bzero(buffer, bufsize); - JUT_ASSERT(420, (reinterpret_cast(buffer) & 0x1f) == 0); + JUT_ASSERT(420, ((u32)((uintptr_t)buffer) & 0x1f) == 0); JUT_ASSERT(421, (bufsize & 0x1f) == 0); DCFlushRange(buffer, bufsize); } else if (param_2 == NULL || buffer != NULL) { diff --git a/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp b/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp index 9873662a2e..df8741a191 100644 --- a/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp +++ b/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp @@ -99,7 +99,7 @@ s32 JAUDynamicSeqDataBlocks::getSeqData(JAISoundID param_0, JAISeqDataUser* para } bool JAUDynamicSeqDataBlocks::appendDynamicSeqDataBlock(JAUSeqDataBlock* seqDataBlock) { - JUT_ASSERT(135, ( reinterpret_cast < u32 > ( seqDataBlock->region.addr ) & 0x1f ) == 0); + JUT_ASSERT(135, (( (u32)(uintptr_t)seqDataBlock->region.addr ) & 0x1f ) == 0); rearrangeLoadingSeqs_(); bool result; if (seqDataBlock->field_0x10.isAnonymous()) { diff --git a/tools/converters/matDL_dis.py b/tools/converters/matDL_dis.py index d104e8e637..68850022e9 100755 --- a/tools/converters/matDL_dis.py +++ b/tools/converters/matDL_dis.py @@ -320,7 +320,7 @@ def convert_binary_to_matDL_c_source(src_path, dest_path, symbol_name, scope): c_file.write("#define U32_AS_U8(v) (u8)(((v) >> 24) & 0xFF), (u8)(((v) >> 16) & 0xFF), (u8)(((v) >> 8) & 0xFF), (u8)(((v) >> 0) & 0xFF)\n") c_file.write("#define U24_AS_U8(v) (u8)(((v) >> 16) & 0xFF), (u8)(((v) >> 8) & 0xFF), (u8)(((v) >> 0) & 0xFF)\n") c_file.write("#define U16_AS_U8(v) (u8)(((v) >> 8) & 0xFF), (u8)(((v) >> 0) & 0xFF)\n") - c_file.write("#define IMAGE_ADDR(addr) (u32)(addr) >> 5\n") + c_file.write("#define IMAGE_ADDR(addr) (u32)(uintptr_t)(addr) >> 5\n") c_file.write("#define LOAD_BP_REG(reg, value) GX_CMD_LOAD_BP_REG, reg, U24_AS_U8(value)\n") c_file.write("#define LOAD_XF_REG(reg, num_args, ...) GX_CMD_LOAD_XF_REG, U16_AS_U8(num_args-1), U16_AS_U8(reg), __VA_ARGS__\n") c_file.write("#define LOAD_CP_REG(reg, value) GX_CMD_LOAD_CP_REG, reg, U32_AS_U8(value)\n")