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

64-bit build. make library paths not absolute.

This commit is contained in:
StapleButter 2017-03-16 19:47:31 +01:00
parent 0b3d150a71
commit 10ca9b6f7f
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GPU3D.cpp
View File

@ -1825,7 +1825,7 @@ void Write32(u32 addr, u32 val)
{ {
GXStat &= ~0x8000; GXStat &= ~0x8000;
ProjMatrixStackPointer = 0; ProjMatrixStackPointer = 0;
PosMatrixStackPointer = 0; //PosMatrixStackPointer = 0;
TexMatrixStackPointer = 0; TexMatrixStackPointer = 0;
} }
val &= 0xC0000000; val &= 0xC0000000;

4
NDS.cpp
View File

@ -311,8 +311,8 @@ void Reset()
// test // test
//LoadROM(); //LoadROM();
//LoadFirmware(); //LoadFirmware();
// a_interp2.nds a_rounding (10) (11) // a_interp2.nds a_rounding (10) (11) a_slope (5)
if (NDSCart::LoadROM("rom/nsmb.nds")) if (NDSCart::LoadROM("rom/sm64ds.nds"))
Running = true; // hax Running = true; // hax
} }

18
melonDS.cbp
View File

@ -4,38 +4,46 @@
<Project> <Project>
<Option title="melonDS" /> <Option title="melonDS" />
<Option pch_mode="2" /> <Option pch_mode="2" />
<Option compiler="gcc" /> <Option compiler="mingw64_gcc" />
<Build> <Build>
<Target title="Debug"> <Target title="Debug">
<Option output="bin/Debug/melonDS" prefix_auto="1" extension_auto="1" /> <Option output="bin/Debug/melonDS" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/Debug/" /> <Option object_output="obj/Debug/" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="mingw64_gcc" />
<Compiler> <Compiler>
<Add option="-m64" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="C:/MinGW/lib/libgdi32.a" /> <Add option="-m64" />
<Add library="gdi32" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release"> <Target title="Release">
<Option output="bin/Release/melonDS" prefix_auto="1" extension_auto="1" /> <Option output="bin/Release/melonDS" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/Release/" /> <Option object_output="obj/Release/" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="mingw64_gcc" />
<Compiler> <Compiler>
<Add option="-O2" /> <Add option="-O2" />
<Add option="-m64" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />
<Add library="C:/MinGW/lib/libgdi32.a" /> <Add option="-m64" />
<Add library="gdi32" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="-m64" />
<Add option="-fexceptions" /> <Add option="-fexceptions" />
</Compiler> </Compiler>
<Linker>
<Add option="-m64" />
</Linker>
<Unit filename="ARM.cpp" /> <Unit filename="ARM.cpp" />
<Unit filename="ARM.h" /> <Unit filename="ARM.h" />
<Unit filename="ARMInterpreter.cpp" /> <Unit filename="ARMInterpreter.cpp" />