diff --git a/Source/Project64-core/3rdParty/7zip.h b/Source/Project64-core/3rdParty/7zip.h index 2649363ab..6f64673a1 100644 --- a/Source/Project64-core/3rdParty/7zip.h +++ b/Source/Project64-core/3rdParty/7zip.h @@ -5,10 +5,10 @@ extern "C" { #endif -#include "7zip\7zCrc.h" -#include "7zip\7z.h" -#include "7zip\7zFile.h" -#include "7zip\Types.h" +#include "7zip/7zCrc.h" +#include "7zip/7z.h" +#include "7zip/7zFile.h" +#include "7zip/Types.h" #ifdef __cplusplus } diff --git a/Source/Script/Unix/project64-core.sh b/Source/Script/Unix/project64-core.sh index c15ecd428..4740b330b 100755 --- a/Source/Script/Unix/project64-core.sh +++ b/Source/Script/Unix/project64-core.sh @@ -12,12 +12,6 @@ FLAGS_x86="\ -I$src \ -I$src/.. \ -I$src/../3rdParty \ - -Wno-unused-result \ - -w \ - -D__interface=struct \ - -Wno-ignored-qualifiers \ - -Wno-write-strings \ - -Wno-format-contains-nul \ -fpermissive \ -S \ -masm=intel \ @@ -30,7 +24,7 @@ CC=g++ AS=as echo Compiling core sources for Project64... -#$CC -o $obj/7zip.asm $src/../3rdParty/7zip.cpp $C_FLAGS # precompiled? +#$CC -o $obj/7zip.asm $src/3rdParty/7zip.cpp $C_FLAGS # precompiled? $CC -o $obj/AppInit.asm $src/AppInit.cpp $C_FLAGS $CC -o $obj/logging.asm $src/Logging.cpp $C_FLAGS $CC -o $obj/MemoryExceptionFilter.asm $src/MemoryExceptionFilter.cpp $C_FLAGS @@ -185,8 +179,8 @@ $AS -o $obj/Settings/type/TmpBool.o $obj/Settings/type/TmpBool.asm $AS -o $obj/Settings/type/TmpNumber.o $obj/Settings/type/TmpNumber.asm $AS -o $obj/Settings/type/TmpString.o $obj/Settings/type/TmpString.asm -set OBJ_LIST="\ -$obj/7zip.o \ +# $obj/7zip.o \ +OBJ_LIST="\ $obj/AppInit.o \ $obj/logging.o \ $obj/Multilanguage/LangClass.o \