ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not specify 7zip for linkage outside _WIN32.

This commit is contained in:
2016-06-05 16:39:51 -04:00
parent 792bf337fb
commit 039fed5a3c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Project64-core/3rdParty/7zip.h vendored
View File

@ -5,10 +5,10 @@
extern "C" { extern "C" {
#endif #endif
#include "7zip\7zCrc.h" #include "7zip/7zCrc.h"
#include "7zip\7z.h" #include "7zip/7z.h"
#include "7zip\7zFile.h" #include "7zip/7zFile.h"
#include "7zip\Types.h" #include "7zip/Types.h"
#ifdef __cplusplus #ifdef __cplusplus
} }

4
Source/Script/Unix/project64-core.sh
View File

@ -30,7 +30,7 @@ CC=g++
AS=as AS=as
echo Compiling core sources for Project64... 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/AppInit.asm $src/AppInit.cpp $C_FLAGS
$CC -o $obj/logging.asm $src/Logging.cpp $C_FLAGS $CC -o $obj/logging.asm $src/Logging.cpp $C_FLAGS
$CC -o $obj/MemoryExceptionFilter.asm $src/MemoryExceptionFilter.cpp $C_FLAGS $CC -o $obj/MemoryExceptionFilter.asm $src/MemoryExceptionFilter.cpp $C_FLAGS
@ -185,8 +185,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/TmpNumber.o $obj/Settings/type/TmpNumber.asm
$AS -o $obj/Settings/type/TmpString.o $obj/Settings/type/TmpString.asm $AS -o $obj/Settings/type/TmpString.o $obj/Settings/type/TmpString.asm
# $obj/7zip.o \
OBJ_LIST="\ OBJ_LIST="\
$obj/7zip.o \
$obj/AppInit.o \ $obj/AppInit.o \
$obj/logging.o \ $obj/logging.o \
$obj/Multilanguage/LangClass.o \ $obj/Multilanguage/LangClass.o \