Rapidjson is now an included project

w4tsn · Sep 1, 2017 · 5ad2eca · 5ad2eca
1 parent 4d3ef2f
commit 5ad2eca
Show file tree

Hide file tree

Showing 18 changed files with 18 additions and 2,719 deletions.
diff --git a/VisualStudio/BOSS.vcxproj b/VisualStudio/BOSS.vcxproj
@@ -138,14 +138,14 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(BWAPI_DIR)/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../include/;$(BWAPI_DIR)/include;$(RAPIDJSON_DIR)/include/rapidjson;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>../../bwapidata/lib/bwapidatad_$(PlatformToolset).lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(STARCRAFT)/bwapidata/lib/bwapidatad_$(PlatformToolset).lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -157,7 +157,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(BWAPI_DIR)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../include;$(BWAPI_DIR)/include;$(RAPIDJSON_DIR)/include/rapidjson;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -169,7 +169,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>../../bwapidata/lib/bwapidata_$(PlatformToolset).lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(STARCRAFT)/bwapidata/lib/bwapidata_$(PlatformToolset).lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateMapFile>true</GenerateMapFile>
     </Link>
     <Bscmake>

diff --git a/VisualStudio/BOSS_main.vcxproj b/VisualStudio/BOSS_main.vcxproj
@@ -72,7 +72,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(BWAPI_DIR)/include;../source/rapidjson;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../include;$(BWAPI_DIR)/include;$(RAPIDJSON_DIR)/include/rapidjson;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -89,7 +89,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(BWAPI_DIR)/include;../source/rapidjson;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../include;$(BWAPI_DIR)/include;$(RAPIDJSON_DIR)/include/rapidjson;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4996;4099</DisableSpecificWarnings>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>

diff --git a/include/BOSSExperiments.h b/include/BOSSExperiments.h
@@ -2,8 +2,8 @@
 
 #include "Common.h"
 #include "JSONTools.h"
-#include "rapidjson/rapidjson.h"
-#include "rapidjson/document.h"
+#include "rapidjson.h"
+#include "document.h"
 
 namespace BOSS
 {

diff --git a/include/BOSSParameters.h b/include/BOSSParameters.h
@@ -2,8 +2,8 @@
 
 #include "BOSS.h"
 #include "JSONTools.h"
-#include "rapidjson/rapidjson.h"
-#include "rapidjson/document.h"
+#include "rapidjson.h"
+#include "document.h"
 #include "CombatSearchExperiment.h"
 
 namespace BOSS

diff --git a/include/BOSSPlotBuildOrders.h b/include/BOSSPlotBuildOrders.h
@@ -2,8 +2,8 @@
 
 #include "BOSS.h"
 #include "JSONTools.h"
-#include "rapidjson/rapidjson.h"
-#include "rapidjson/document.h"
+#include "rapidjson.h"
+#include "document.h"
 
 namespace BOSS
 {

diff --git a/include/CombatSearchExperiment.h b/include/CombatSearchExperiment.h
@@ -3,8 +3,8 @@
 #include "BOSS.h"
 #include "JSONTools.h"
 #include <memory>
-#include "rapidjson/rapidjson.h"
-#include "rapidjson/document.h"
+#include "rapidjson.h"
+#include "document.h"
 
 namespace BOSS
 {

diff --git a/include/JSONTools.h b/include/JSONTools.h
@@ -3,8 +3,8 @@
 #include "BOSS.h"
 #include "Common.h"
 #include "BuildOrder.h"
-#include "rapidjson/rapidjson.h"
-#include "rapidjson/document.h"
+#include "rapidjson.h"
+#include "document.h"
 
 namespace BOSS
 {

diff --git a/source/deprecated/BOSSVisExperiment.h b/source/deprecated/BOSSVisExperiment.h
@@ -3,8 +3,8 @@
 #include "BOSS.h"
 #include "GUITools.h"
 #include "JSONTools.h"
-#include "rapidjson/rapidjson.h"
-#include "rapidjson/document.h"
+#include "rapidjson.h"
+#include "document.h"
 
 namespace BOSS
 {