Merge pull request #245 from TorchCraft/develop

New release! 1.4.0!
TorchCraft · Jan 11, 2018 · 3465afa · 3465afa
2 parents a0c93b8 + 7c62caf
commit 3465afa
Show file tree

Hide file tree

Showing 42 changed files with 7,752 additions and 1,968 deletions.
diff --git a/.clang-format b/.clang-format
@@ -19,7 +19,6 @@ BinPackParameters: false
 BreakBeforeBinaryOperators: false
 BreakBeforeBraces: Attach
 BreakConstructorInitializersBeforeComma: false
-BreakStringLiterals: false
 ColumnLimit: 80
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 4

diff --git a/.gitignore b/.gitignore
@@ -2,10 +2,10 @@
 
 /build.luarocks/
 /build/
+/BWEnv/build/
 
 ## VisualStudio ###########
 
-/BWEnv/build/
 # User-specific files
 *.suo
 *.user

diff --git a/BWEnv/CMakeLists.txt b/BWEnv/CMakeLists.txt
@@ -3,9 +3,16 @@ project(BWEnv)
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
 set(CMAKE_SHARED_LIBRARY_PREFIX "")
 
+if (MSVC)
+  # Enables TorchCraft usage on SSCAIT.
+  # The SSCAIT submission process doesn't let you put files anywhere that
+  # would allow them to be dynamically linked (namely, the working directory)
+  # The fix is to statically link them to bypass that process.
+  set(CMAKE_EXE_LINKER_FLAGS "-static")
+endif(MSVC)
+
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
 
 if (USE_MINI_OPENBWAPI)
@@ -43,6 +50,9 @@ add_library(BWEnvObj OBJECT
   src/utils.cc
   src/zmq_server.cc
   ../replayer/frame.cpp
+  ../replayer/frame_serialization.cpp
+  ../replayer/frame_diff.cpp
+  ../replayer/frame_diff_serialization.cpp
 )
 
 set_property(TARGET BWEnvObj PROPERTY POSITION_INDEPENDENT_CODE ON)

diff --git a/BWEnv/VisualStudio/BWEnv.sln b/BWEnv/VisualStudio/BWEnv.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.27004.2006
 MinimumVisualStudioVersion = 12.0.0
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BWEnv", "BWEnv.vcxproj", "{AE3B9DC4-5FBB-4B57-8AB4-0D84D8649D78}"
 EndProject
@@ -12,8 +12,8 @@ Global
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AE3B9DC4-5FBB-4B57-8AB4-0D84D8649D78}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AE3B9DC4-5FBB-4B57-8AB4-0D84D8649D78}.Debug|Win32.Build.0 = Debug|Win32
+		{AE3B9DC4-5FBB-4B57-8AB4-0D84D8649D78}.Debug|Win32.ActiveCfg = Release|Win32
+		{AE3B9DC4-5FBB-4B57-8AB4-0D84D8649D78}.Debug|Win32.Build.0 = Release|Win32
 		{AE3B9DC4-5FBB-4B57-8AB4-0D84D8649D78}.DLL-Debug|Win32.ActiveCfg = DLL-Debug|Win32
 		{AE3B9DC4-5FBB-4B57-8AB4-0D84D8649D78}.DLL-Debug|Win32.Build.0 = DLL-Debug|Win32
 		{AE3B9DC4-5FBB-4B57-8AB4-0D84D8649D78}.DLL-Release|Win32.ActiveCfg = DLL-Release|Win32
@@ -24,4 +24,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {BFC2F1B0-38A3-4C7A-8020-2F68838AE062}
+	EndGlobalSection
 EndGlobal
diff --git a/BWEnv/VisualStudio/BWEnv.vcxproj b/BWEnv/VisualStudio/BWEnv.vcxproj
@@ -23,7 +23,7 @@
     <RootNamespace>BWEnv</RootNamespace>
     <Keyword>Win32Proj</Keyword>
     <ProjectName>BWEnv</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -149,7 +149,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(BWAPI_DIR)/include;$(SolutionDir)/../include;$(SolutionDir)/../include/libzmq/include;$(SolutionDir)../../include/;$(SolutionDir)/../fbs/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;WIN32;NDEBUG;_WINDOWS;_USRDLL;BWENV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NOMINMAX;WIN32;NDEBUG;_WINDOWS;_USRDLL;BWENV_EXPORTS;ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
@@ -165,7 +165,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>Ws2_32.lib;$(SolutionDir)/../lib/libzmq.lib;$(BWAPI_DIR)/lib/BWAPI.lib;$(BWAPI_DIR)/lib/BWAPIClient.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Ws2_32.lib;$(SolutionDir)/../lib/libzmq.lib;$(BWAPI_DIR)/lib/BWAPI.lib;$(BWAPI_DIR)/lib/BWAPIClient.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>
       </AdditionalLibraryDirectories>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
@@ -212,6 +212,9 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(BWAPI_DIR)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\replayer\frame.cpp" />
+    <ClCompile Include="..\..\replayer\frame_serialization.cpp" />
+    <ClCompile Include="..\..\replayer\frame_diff.cpp" />
+    <ClCompile Include="..\..\replayer\frame_diff_serialization.cpp" />
     <ClCompile Include="..\src\config_manager.cc" />
     <ClCompile Include="..\src\controller.cc" />
     <ClCompile Include="..\src\dll.cc" />
@@ -234,4 +237,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/BWEnv/VisualStudio/BWEnv.vcxproj.filters b/BWEnv/VisualStudio/BWEnv.vcxproj.filters
@@ -1,69 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="src">
-      <UniqueIdentifier>{22e0184c-2d7b-4497-b2eb-36f475c2b0f6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="include">
-      <UniqueIdentifier>{d76c4772-83d6-4a7f-a3ac-7e0b3bd627a6}</UniqueIdentifier>
-    </Filter>
+    <ClCompile Include="$(SolutionDir)\..\src\main.cc" />
+    <ClCompile Include="..\..\replayer\frame.cpp" />
+    <ClCompile Include="..\..\replayer\frame_serialization.cpp" />
+    <ClCompile Include="..\..\replayer\frame_diff.cpp" />
+    <ClCompile Include="..\..\replayer\frame_diff_serialization.cpp" />
+    <ClCompile Include="..\src\config_manager.cc" />
+    <ClCompile Include="..\src\controller.cc" />
+    <ClCompile Include="..\src\dll.cc" />
+    <ClCompile Include="..\src\module.cc" />
+    <ClCompile Include="..\src\recorder.cc" />
+    <ClCompile Include="..\src\user_actions.cc" />
+    <ClCompile Include="..\src\utils.cc" />
+    <ClCompile Include="..\src\zmq_server.cc" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="$(SolutionDir)\..\src\main.cc">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\zmq_server.cc">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\controller.cc">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\utils.cc">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\dll.cc">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\module.cc">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\config_manager.cc">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\recorder.cc">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\replayer\frame.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\user_actions.cc">
-      <Filter>src</Filter>
-    </ClCompile>
+    <ClInclude Include="..\..\include\frame.h" />
+    <ClInclude Include="..\include\config_manager.h" />
+    <ClInclude Include="..\include\controller.h" />
+    <ClInclude Include="..\include\module.h" />
+    <ClInclude Include="..\include\recorder.h" />
+    <ClInclude Include="..\include\user_actions.h" />
+    <ClInclude Include="..\include\utils.h" />
+    <ClInclude Include="..\include\zmq_server.h" />
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\ZMQ_server.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\controller.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\utils.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\module.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\config_manager.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\recorder.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\frame.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\user_actions.h">
-      <Filter>include</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
+</Project>