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

Updating to latest quickerNES commit and changing remote to TASEmulators/quickerNES 

Fixing msvc project
This commit is contained in:
SergioMartin86 2024-03-24 19:50:49 +03:00 committed by feos
parent eb70cd474e
commit 2af6bf3c34
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -72,4 +72,4 @@
url = https://github.com/libusb/libusb.git url = https://github.com/libusb/libusb.git
[submodule "quicknes/core"] [submodule "quicknes/core"]
path = quicknes/core path = quicknes/core
url = https://github.com/SergioMartin86/quickerNES.git url = https://github.com/TASEmulators/quickerNES.git

6
quicknes/bizinterface.cpp
View File

@ -1,9 +1,9 @@
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#include <emu.hpp> #include <emu.hpp>
#include <jaffarCommon/include/file.hpp> #include <jaffarCommon/file.hpp>
#include <jaffarCommon/include/serializers/contiguous.hpp> #include <jaffarCommon/serializers/contiguous.hpp>
#include <jaffarCommon/include/deserializers/contiguous.hpp> #include <jaffarCommon/deserializers/contiguous.hpp>
#ifdef _MSC_VER #ifdef _MSC_VER
#define EXPORT extern "C" __declspec(dllexport) #define EXPORT extern "C" __declspec(dllexport)

2
quicknes/make/Makefile
View File

@ -13,7 +13,7 @@ endif
CXXFLAGS_32 = -march=pentium4 -mtune=core2 CXXFLAGS_32 = -march=pentium4 -mtune=core2
CXXFLAGS_64 = CXXFLAGS_64 =
CXXFLAGS = -Wall -I../core/source/quickerNES/core/ -I../core/extern -O3 -Wfatal-errors -Werror -fomit-frame-pointer -flto -D_QUICKERNES_DETECT_JOYPAD_READS -D_QUICKERNES_ENABLE_TRACEBACK_SUPPORT $(CXXFLAGS_$(ARCH)) CXXFLAGS = -Wall -I../core/source/quickerNES/core/ -I../core/extern/jaffarCommon/include -D__INLINE__=inline -O3 -Wfatal-errors -Werror -fomit-frame-pointer -flto -D_QUICKERNES_DETECT_JOYPAD_READS -D_QUICKERNES_ENABLE_TRACEBACK_SUPPORT $(CXXFLAGS_$(ARCH))
# TODO: include these as options in the Makefile # TODO: include these as options in the Makefile
# -fprofile-generate # -fprofile-generate

14
quicknes/msvc/libquicknes.vcxproj
View File

@ -11,11 +11,11 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\core\extern\jaffarCommon\include\file.hpp" /> <ClInclude Include="..\core\extern\jaffarCommon\include\jaffarCommon\file.hpp" />
<ClInclude Include="..\core\extern\jaffarCommon\include\deserializers\contiguous.hpp" /> <ClInclude Include="..\core\extern\jaffarCommon\include\jaffarCommon\deserializers\contiguous.hpp" />
<ClInclude Include="..\core\extern\jaffarCommon\include\deserializers\base.hpp" /> <ClInclude Include="..\core\extern\jaffarCommon\include\jaffarCommon\deserializers\base.hpp" />
<ClInclude Include="..\core\extern\jaffarCommon\include\serializers\contiguous.hpp" /> <ClInclude Include="..\core\extern\jaffarCommon\include\jaffarCommon\serializers\contiguous.hpp" />
<ClInclude Include="..\core\extern\jaffarCommon\include\serializers\base.hpp" /> <ClInclude Include="..\core\extern\jaffarCommon\include\jaffarCommon\serializers\base.hpp" />
<ClInclude Include="..\core\source\quickerNES\core\apu\vrc7\emu2413_state.hpp" /> <ClInclude Include="..\core\source\quickerNES\core\apu\vrc7\emu2413_state.hpp" />
<ClInclude Include="..\core\source\quickerNES\core\apu\vrc7\apu.hpp" /> <ClInclude Include="..\core\source\quickerNES\core\apu\vrc7\apu.hpp" />
<ClInclude Include="..\core\source\quickerNES\core\apu\vrc7\emu2413.hpp" /> <ClInclude Include="..\core\source\quickerNES\core\apu\vrc7\emu2413.hpp" />
@ -148,10 +148,10 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IncludePath>..\core\source\quickerNES\core;..\core\extern;$(IncludePath)</IncludePath> <IncludePath>..\core\source\quickerNES\core;..\core\extern\jaffarCommon\include;$(IncludePath)</IncludePath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IncludePath>..\core\source\quickerNES\core;..\core\extern;$(IncludePath)</IncludePath> <IncludePath>..\core\source\quickerNES\core;..\core\extern\jaffarCommon\include;$(IncludePath)</IncludePath>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile> <ClCompile>