compilable for vs

nguyenpham · Jul 18, 2019 · def1688 · def1688
1 parent 1f5ad20
commit def1688
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/demo.png b/demo.png
diff --git a/projects/Banksia.vcxproj.user b/projects/Banksia.vcxproj.user
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerCommandArguments>-u -c 2 -d c:\match\engines</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-jsonpath c:\match\tour.json</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <LocalDebuggerWorkingDirectory>c:\match</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerCommandArguments>-u -c 2 -d c:\match\engines</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-jsonpath c:\match\tour.json</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <LocalDebuggerWorkingDirectory>c:\match</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerCommandArguments>-u -c 2 -d c:\match\engines</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-jsonpath c:\match\tour.json</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <LocalDebuggerWorkingDirectory>c:\match</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LocalDebuggerCommandArguments>-u -c 2 -d c:\match\engines</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-jsonpath c:\match\tour.json</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <LocalDebuggerWorkingDirectory>c:\match</LocalDebuggerWorkingDirectory>
   </PropertyGroup>

diff --git a/src/game/engine.cpp b/src/game/engine.cpp
@@ -189,7 +189,9 @@ void Engine::parseLine(const std::string& line)
 void Engine::deleteThread()
 {
     if (pThread && pThread->joinable()) {
+#ifndef _WIN32
         pthread_cancel(pThread->native_handle());
+#endif
         pThread = nullptr;
         std::cout << "Warning: thread is still resident " << name << std::endl;
     }