diff --git a/BizHawk.MultiClient/output/dll/libmeteor.dll b/BizHawk.MultiClient/output/dll/libmeteor.dll index 9a0bbf4646..9e40740e01 100644 Binary files a/BizHawk.MultiClient/output/dll/libmeteor.dll and b/BizHawk.MultiClient/output/dll/libmeteor.dll differ diff --git a/libmeteor/include/ameteor/timer.hpp b/libmeteor/include/ameteor/timer.hpp index 4d51730258..ffdd055c51 100644 --- a/libmeteor/include/ameteor/timer.hpp +++ b/libmeteor/include/ameteor/timer.hpp @@ -61,10 +61,10 @@ namespace AMeteor struct { unsigned int prescaler : 2; - bool countup : 1; + unsigned int countup : 1; unsigned int unused1 : 3; - bool irq : 1; - bool start : 1; + unsigned int irq : 1; + unsigned int start : 1; unsigned int unused2 : 8; } b; }; diff --git a/libmeteor/libmeteor.vcxproj b/libmeteor/libmeteor.vcxproj index 89cb51c975..2784348709 100644 --- a/libmeteor/libmeteor.vcxproj +++ b/libmeteor/libmeteor.vcxproj @@ -58,6 +58,9 @@ Windows true + + copy /y $(TargetDir)$(TargetFileName) $(ProjectDir)..\Bizhawk.MultiClient\output\dll\$(TargetFileName) + @@ -76,6 +79,9 @@ true true + + copy /y $(TargetDir)$(TargetFileName) $(ProjectDir)..\Bizhawk.MultiClient\output\dll\$(TargetFileName) +