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

Merge branch 'master' of https://github.com/project64/project64

This commit is contained in:
zilmar 2017-11-10 19:42:25 +11:00
parent 0730582085 281b219877
commit 169f9d92bf
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Config/Project64.rdb
View File

@ -759,16 +759,19 @@ Delay SI=Yes
Good Name=Bokujou Monogatari 2 (J) (V1.0) Good Name=Bokujou Monogatari 2 (J) (V1.0)
Internal Name=ÎÞ¸¼Þ®³ÓɶÞÀØ2 Internal Name=ÎÞ¸¼Þ®³ÓɶÞÀØ2
Status=Compatible Status=Compatible
Counter Factor=1
[7365D8F8-9ED9326F-C:4A] [7365D8F8-9ED9326F-C:4A]
Good Name=Bokujou Monogatari 2 (J) (V1.1) Good Name=Bokujou Monogatari 2 (J) (V1.1)
Internal Name=ÎÞ¸¼Þ®³ÓɶÞÀØ2 Internal Name=ÎÞ¸¼Þ®³ÓɶÞÀØ2
Status=Compatible Status=Compatible
Counter Factor=1
[736657F6-3C88A702-C:4A] [736657F6-3C88A702-C:4A]
Good Name=Bokujou Monogatari 2 (J) (V1.2) Good Name=Bokujou Monogatari 2 (J) (V1.2)
Internal Name=ÎÞ¸¼Þ®³ÓɶÞÀØ2 Internal Name=ÎÞ¸¼Þ®³ÓɶÞÀØ2
Status=Compatible Status=Compatible
Counter Factor=1
[5A160336-BC7B37B0-C:50] [5A160336-BC7B37B0-C:50]
Good Name=Bomberman 64 (E) Good Name=Bomberman 64 (E)

3
Source/Script/MinGW/common.cmd
View File

@ -31,6 +31,7 @@ ECHO Compiling common library sources for Project64...
%CC% -o %obj%\md5.asm %src%\md5.cpp %C_FLAGS% %CC% -o %obj%\md5.asm %src%\md5.cpp %C_FLAGS%
%CC% -o %obj%\MemTest.asm %src%\MemTest.cpp %C_FLAGS% %CC% -o %obj%\MemTest.asm %src%\MemTest.cpp %C_FLAGS%
%CC% -o %obj%\path.asm %src%\path.cpp %C_FLAGS% %CC% -o %obj%\path.asm %src%\path.cpp %C_FLAGS%
%CC% -o %obj%\Random.asm %src%\Random.cpp %C_FLAGS%
%CC% -o %obj%\stdstring.asm %src%\StdString.cpp %C_FLAGS% %CC% -o %obj%\stdstring.asm %src%\StdString.cpp %C_FLAGS%
%CC% -o %obj%\SyncEvent.asm %src%\SyncEvent.cpp %C_FLAGS% %CC% -o %obj%\SyncEvent.asm %src%\SyncEvent.cpp %C_FLAGS%
%CC% -o %obj%\Trace.asm %src%\Trace.cpp %C_FLAGS% %CC% -o %obj%\Trace.asm %src%\Trace.cpp %C_FLAGS%
@ -44,6 +45,7 @@ ECHO Assembling common library sources...
%AS% -o %obj%\md5.o %obj%\md5.asm %AS% -o %obj%\md5.o %obj%\md5.asm
%AS% -o %obj%\MemTest.o %obj%\MemTest.asm %AS% -o %obj%\MemTest.o %obj%\MemTest.asm
%AS% -o %obj%\path.o %obj%\path.asm %AS% -o %obj%\path.o %obj%\path.asm
%AS% -o %obj%\Random.o %obj%\Random.asm
%AS% -o %obj%\stdstring.o %obj%\stdstring.asm %AS% -o %obj%\stdstring.o %obj%\stdstring.asm
%AS% -o %obj%\SyncEvent.o %obj%\SyncEvent.asm %AS% -o %obj%\SyncEvent.o %obj%\SyncEvent.asm
%AS% -o %obj%\Trace.o %obj%\Trace.asm %AS% -o %obj%\Trace.o %obj%\Trace.asm
@ -55,6 +57,7 @@ set OBJ_LIST=^
%obj%\Trace.o^ %obj%\Trace.o^
%obj%\SyncEvent.o^ %obj%\SyncEvent.o^
%obj%\stdstring.o^ %obj%\stdstring.o^
%obj%\Random.o^
%obj%\path.o^ %obj%\path.o^
%obj%\MemTest.o^ %obj%\MemTest.o^
%obj%\md5.o^ %obj%\md5.o^

3
Source/Script/Unix/common.sh
View File

@ -26,6 +26,7 @@ $CC -o $obj/MemoryManagement.asm $src/MemoryManagement.cpp $C_FLAGS
$CC -o $obj/MemTest.asm $src/MemTest.cpp $C_FLAGS $CC -o $obj/MemTest.asm $src/MemTest.cpp $C_FLAGS
$CC -o $obj/path.asm $src/path.cpp $C_FLAGS $CC -o $obj/path.asm $src/path.cpp $C_FLAGS
$CC -o $obj/Platform.asm $src/Platform.cpp $C_FLAGS $CC -o $obj/Platform.asm $src/Platform.cpp $C_FLAGS
$CC -o $obj/Random.asm $src/Random.cpp $C_FLAGS
$CC -o $obj/stdstring.asm $src/StdString.cpp $C_FLAGS $CC -o $obj/stdstring.asm $src/StdString.cpp $C_FLAGS
$CC -o $obj/SyncEvent.asm $src/SyncEvent.cpp $C_FLAGS $CC -o $obj/SyncEvent.asm $src/SyncEvent.cpp $C_FLAGS
$CC -o $obj/DateTimeClass.asm $src/DateTimeClass.cpp $C_FLAGS $CC -o $obj/DateTimeClass.asm $src/DateTimeClass.cpp $C_FLAGS
@ -43,6 +44,7 @@ $AS -o $obj/MemoryManagement.o $obj/MemoryManagement.asm
$AS -o $obj/MemTest.o $obj/MemTest.asm $AS -o $obj/MemTest.o $obj/MemTest.asm
$AS -o $obj/path.o $obj/path.asm $AS -o $obj/path.o $obj/path.asm
$AS -o $obj/Platform.o $obj/Platform.asm $AS -o $obj/Platform.o $obj/Platform.asm
$AS -o $obj/Random.o $obj/Random.asm
$AS -o $obj/stdstring.o $obj/stdstring.asm $AS -o $obj/stdstring.o $obj/stdstring.asm
$AS -o $obj/SyncEvent.o $obj/SyncEvent.asm $AS -o $obj/SyncEvent.o $obj/SyncEvent.asm
$AS -o $obj/DateTimeClass.o $obj/DateTimeClass.asm $AS -o $obj/DateTimeClass.o $obj/DateTimeClass.asm
@ -57,6 +59,7 @@ OBJ_LIST="\
$obj/DateTimeClass.o \ $obj/DateTimeClass.o \
$obj/SyncEvent.o \ $obj/SyncEvent.o \
$obj/stdstring.o \ $obj/stdstring.o \
$obj/Random.o \
$obj/Platform.o \ $obj/Platform.o \
$obj/path.o \ $obj/path.o \
$obj/MemTest.o \ $obj/MemTest.o \