diff --git a/BizHawk.MultiClient/output/dll/libco_msvc_win32.dll b/BizHawk.MultiClient/output/dll/libco_msvc_win32.dll index 4af5ecbc4e..6bd497731e 100644 Binary files a/BizHawk.MultiClient/output/dll/libco_msvc_win32.dll and b/BizHawk.MultiClient/output/dll/libco_msvc_win32.dll differ diff --git a/libsnes/libco_msvc_win32/Release/libco_msvc_win32.dll b/libsnes/libco_msvc_win32/Release/libco_msvc_win32.dll index 4af5ecbc4e..6bd497731e 100644 Binary files a/libsnes/libco_msvc_win32/Release/libco_msvc_win32.dll and b/libsnes/libco_msvc_win32/Release/libco_msvc_win32.dll differ diff --git a/libsnes/libco_msvc_win32/Release/libco_msvc_win32.lib b/libsnes/libco_msvc_win32/Release/libco_msvc_win32.lib index a1157dabfa..f5f4c5d259 100644 Binary files a/libsnes/libco_msvc_win32/Release/libco_msvc_win32.lib and b/libsnes/libco_msvc_win32/Release/libco_msvc_win32.lib differ diff --git a/libsnes/libco_msvc_win32/libco_msvc_win32.sln b/libsnes/libco_msvc_win32/libco_msvc_win32.sln index 081e42f3e9..54d91a63f0 100644 --- a/libsnes/libco_msvc_win32/libco_msvc_win32.sln +++ b/libsnes/libco_msvc_win32/libco_msvc_win32.sln @@ -1,7 +1,7 @@  -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libco_msvc", "libco_msvc_win32.vcproj", "{C5D03072-BBF9-4DED-8CE6-5467736251BF}" +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libco_msvc_win32", "libco_msvc_win32.vcxproj", "{C5D03072-BBF9-4DED-8CE6-5467736251BF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/libsnes/libco_msvc_win32/libco_msvc_win32.vcproj b/libsnes/libco_msvc_win32/libco_msvc_win32.vcproj deleted file mode 100644 index 9ce611cc59..0000000000 --- a/libsnes/libco_msvc_win32/libco_msvc_win32.vcproj +++ /dev/null @@ -1,187 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libsnes/libco_msvc_win32/libco_msvc_win32.vcxproj b/libsnes/libco_msvc_win32/libco_msvc_win32.vcxproj new file mode 100644 index 0000000000..949f2d3d81 --- /dev/null +++ b/libsnes/libco_msvc_win32/libco_msvc_win32.vcxproj @@ -0,0 +1,111 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {C5D03072-BBF9-4DED-8CE6-5467736251BF} + libco_msvc_win32 + Win32Proj + + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + AllRules.ruleset + + + AllRules.ruleset + + + + + + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCO_MSVC_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Windows + MachineX86 + + + copy $(TargetPath) ..\..\BizHawk.MultiClient\output\dll + + + + + + + + + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCO_MSVC_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + true + Windows + true + true + MachineX86 + + + copy $(TargetPath) ..\..\BizHawk.MultiClient\output\dll + + + + + + + + + + + + \ No newline at end of file diff --git a/libsnes/libco_msvc_win32/readme.txt b/libsnes/libco_msvc_win32/readme.txt index 4468772c2c..b060d289ee 100644 --- a/libsnes/libco_msvc_win32/readme.txt +++ b/libsnes/libco_msvc_win32/readme.txt @@ -8,4 +8,5 @@ My efforts are in trying-to-port-to-mingw-win32.c; I don't know why it isn't wor Because libco needs to be a bit more properly win32 in order for it to get used from .net code. .net throws exceptions in each thread when it needs to suspend them for GC. Those exceptions get garbled without more proper win32 stack frame setup, and the process terminates. -Additionally, you wont be able to debug very well from callbacks out of a coroutine into c# without this. \ No newline at end of file +Additionally, you wont be able to debug very well from callbacks out of a coroutine into c# without this. + * Note: you can't debug very well anyway due to mingw code having no debug symbols in the callstack. \ No newline at end of file