Skip to content

Commit

Permalink
64-bit build. make library paths not absolute.
Browse files Browse the repository at this point in the history
  • Loading branch information
Arisotura committed Mar 16, 2017
1 parent 0b3d150 commit 10ca9b6
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
2 changes: 1 addition & 1 deletion GPU3D.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1825,7 +1825,7 @@ void Write32(u32 addr, u32 val)
{
GXStat &= ~0x8000;
ProjMatrixStackPointer = 0;
PosMatrixStackPointer = 0;
//PosMatrixStackPointer = 0;
TexMatrixStackPointer = 0;
}
val &= 0xC0000000;
Expand Down
4 changes: 2 additions & 2 deletions NDS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,8 @@ void Reset()
// test
//LoadROM();
//LoadFirmware();
// a_interp2.nds a_rounding (10) (11)
if (NDSCart::LoadROM("rom/nsmb.nds"))
// a_interp2.nds a_rounding (10) (11) a_slope (5)
if (NDSCart::LoadROM("rom/sm64ds.nds"))
Running = true; // hax
}

Expand Down
18 changes: 13 additions & 5 deletions melonDS.cbp
Original file line number Diff line number Diff line change
Expand Up @@ -4,38 +4,46 @@
<Project>
<Option title="melonDS" />
<Option pch_mode="2" />
<Option compiler="gcc" />
<Option compiler="mingw64_gcc" />
<Build>
<Target title="Debug">
<Option output="bin/Debug/melonDS" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/Debug/" />
<Option type="1" />
<Option compiler="gcc" />
<Option compiler="mingw64_gcc" />
<Compiler>
<Add option="-m64" />
<Add option="-g" />
</Compiler>
<Linker>
<Add library="C:/MinGW/lib/libgdi32.a" />
<Add option="-m64" />
<Add library="gdi32" />
</Linker>
</Target>
<Target title="Release">
<Option output="bin/Release/melonDS" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/Release/" />
<Option type="1" />
<Option compiler="gcc" />
<Option compiler="mingw64_gcc" />
<Compiler>
<Add option="-O2" />
<Add option="-m64" />
</Compiler>
<Linker>
<Add option="-s" />
<Add library="C:/MinGW/lib/libgdi32.a" />
<Add option="-m64" />
<Add library="gdi32" />
</Linker>
</Target>
</Build>
<Compiler>
<Add option="-Wall" />
<Add option="-m64" />
<Add option="-fexceptions" />
</Compiler>
<Linker>
<Add option="-m64" />
</Linker>
<Unit filename="ARM.cpp" />
<Unit filename="ARM.h" />
<Unit filename="ARMInterpreter.cpp" />
Expand Down

0 comments on commit 10ca9b6

Please sign in to comment.