Merge pull request #99 from ryobg/devel

Project file path fixes.
ryobg · Dec 19, 2022 · f70ae7e · f70ae7e
2 parents 0ff5fe6 + d69f0fb
commit f70ae7e
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 74 deletions.
diff --git a/dep/skse64/common/common.vcxproj b/dep/skse64/common/common.vcxproj
@@ -18,6 +18,67 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="common\IArchive.cpp" />
+    <ClCompile Include="common\IBufferStream.cpp" />
+    <ClCompile Include="common\IConsole.cpp" />
+    <ClCompile Include="common\IDatabase.cpp" />
+    <ClCompile Include="common\IDataStream.cpp" />
+    <ClCompile Include="common\IDebugLog.cpp" />
+    <ClCompile Include="common\IDirectoryIterator.cpp" />
+    <ClCompile Include="common\IDynamicCreate.cpp" />
+    <ClCompile Include="common\IErrors.cpp" />
+    <ClCompile Include="common\IEvent.cpp" />
+    <ClCompile Include="common\IFIFO.cpp" />
+    <ClCompile Include="common\IFileStream.cpp" />
+    <ClCompile Include="common\IInterlockedLong.cpp" />
+    <ClCompile Include="common\IMemPool.cpp" />
+    <ClCompile Include="common\IMutex.cpp" />
+    <ClCompile Include="common\IPipeClient.cpp" />
+    <ClCompile Include="common\IPipeServer.cpp" />
+    <ClCompile Include="common\IPrefix.cpp" />
+    <ClCompile Include="common\IRangeMap.cpp" />
+    <ClCompile Include="common\IReadWriteLock.cpp" />
+    <ClCompile Include="common\ISegmentStream.cpp" />
+    <ClCompile Include="common\ISingleton.cpp" />
+    <ClCompile Include="common\ITextParser.cpp" />
+    <ClCompile Include="common\IThread.cpp" />
+    <ClCompile Include="common\ITimer.cpp" />
+    <ClCompile Include="common\ITypes.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="common\IArchive.h" />
+    <ClInclude Include="common\IBufferStream.h" />
+    <ClInclude Include="common\IConsole.h" />
+    <ClInclude Include="common\ICriticalSection.h" />
+    <ClInclude Include="common\IDatabase.h" />
+    <ClInclude Include="common\IDataStream.h" />
+    <ClInclude Include="common\IDebugLog.h" />
+    <ClInclude Include="common\IDirectoryIterator.h" />
+    <ClInclude Include="common\IDynamicCreate.h" />
+    <ClInclude Include="common\IErrors.h" />
+    <ClInclude Include="common\IEvent.h" />
+    <ClInclude Include="common\IFIFO.h" />
+    <ClInclude Include="common\IFileStream.h" />
+    <ClInclude Include="common\IInterlockedLong.h" />
+    <ClInclude Include="common\ILinkedList.h" />
+    <ClInclude Include="common\IMemPool.h" />
+    <ClInclude Include="common\IMutex.h" />
+    <ClInclude Include="common\IPipeClient.h" />
+    <ClInclude Include="common\IPipeServer.h" />
+    <ClInclude Include="common\IPrefix.h" />
+    <ClInclude Include="common\IRangeMap.h" />
+    <ClInclude Include="common\IReadWriteLock.h" />
+    <ClInclude Include="common\ISegmentStream.h" />
+    <ClInclude Include="common\ISingleton.h" />
+    <ClInclude Include="common\ITextParser.h" />
+    <ClInclude Include="common\IThread.h" />
+    <ClInclude Include="common\ITimer.h" />
+    <ClInclude Include="common\ITypes.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="common\IDatabase.inc" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}</ProjectGuid>
     <RootNamespace>common</RootNamespace>
@@ -112,7 +173,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -143,7 +204,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -156,70 +217,6 @@
       <ForcedIncludeFiles>common/IPrefix.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
     </ClCompile>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="IBufferStream.cpp" />
-    <ClCompile Include="IDataStream.cpp" />
-    <ClCompile Include="IFileStream.cpp" />
-    <ClCompile Include="ISegmentStream.cpp" />
-    <ClCompile Include="IDebugLog.cpp" />
-    <ClCompile Include="IErrors.cpp" />
-    <ClCompile Include="IEvent.cpp" />
-    <ClCompile Include="IInterlockedLong.cpp" />
-    <ClCompile Include="IMutex.cpp" />
-    <ClCompile Include="IReadWriteLock.cpp" />
-    <ClCompile Include="IThread.cpp" />
-    <ClCompile Include="IArchive.cpp" />
-    <ClCompile Include="IDatabase.cpp" />
-    <ClCompile Include="IFIFO.cpp" />
-    <ClCompile Include="IRangeMap.cpp" />
-    <ClCompile Include="ISingleton.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="ITextParser.cpp" />
-    <ClCompile Include="ITypes.cpp" />
-    <ClCompile Include="IConsole.cpp" />
-    <ClCompile Include="IDynamicCreate.cpp" />
-    <ClCompile Include="ITimer.cpp" />
-    <ClCompile Include="IMemPool.cpp" />
-    <ClCompile Include="IPipeClient.cpp" />
-    <ClCompile Include="IPipeServer.cpp" />
-    <ClCompile Include="IDirectoryIterator.cpp" />
-    <ClCompile Include="IPrefix.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="IBufferStream.h" />
-    <ClInclude Include="IDataStream.h" />
-    <ClInclude Include="IFileStream.h" />
-    <ClInclude Include="ISegmentStream.h" />
-    <ClInclude Include="IDebugLog.h" />
-    <ClInclude Include="IErrors.h" />
-    <ClInclude Include="ICriticalSection.h" />
-    <ClInclude Include="IEvent.h" />
-    <ClInclude Include="IInterlockedLong.h" />
-    <ClInclude Include="IMutex.h" />
-    <ClInclude Include="IReadWriteLock.h" />
-    <ClInclude Include="IThread.h" />
-    <ClInclude Include="IArchive.h" />
-    <ClInclude Include="IDatabase.h" />
-    <ClInclude Include="IFIFO.h" />
-    <ClInclude Include="ILinkedList.h" />
-    <ClInclude Include="IRangeMap.h" />
-    <ClInclude Include="ISingleton.h" />
-    <ClInclude Include="ITextParser.h" />
-    <ClInclude Include="ITypes.h" />
-    <ClInclude Include="IConsole.h" />
-    <ClInclude Include="IDynamicCreate.h" />
-    <ClInclude Include="ITimer.h" />
-    <ClInclude Include="IMemPool.h" />
-    <ClInclude Include="IPipeClient.h" />
-    <ClInclude Include="IPipeServer.h" />
-    <ClInclude Include="IDirectoryIterator.h" />
-    <ClInclude Include="IPrefix.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="IDatabase.inc" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/dep/skse64/skse/skse64/skse64.vcxproj b/dep/skse64/skse/skse64/skse64.vcxproj
@@ -65,7 +65,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_USRDLL;SKSE64_EXPORTS;RUNTIME_VERSION=0x01050610;RUNTIME;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>common/IPrefix.h</ForcedIncludeFiles>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -93,7 +93,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_USRDLL;SKSE64_EXPORTS;RUNTIME;RUNTIME_VERSION=0x01050610;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>common/IPrefix.h</ForcedIncludeFiles>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>

diff --git a/dep/skse64/skse/skse64_common/skse64_common.vcxproj b/dep/skse64/skse/skse64_common/skse64_common.vcxproj
@@ -79,7 +79,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>common/IPrefix.h</ForcedIncludeFiles>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -97,7 +97,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>common/IPrefix.h</ForcedIncludeFiles>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>

diff --git a/src/JContainers/JContainers.vcxproj b/src/JContainers/JContainers.vcxproj
@@ -239,7 +239,7 @@
     <ClCompile>
       <Optimization>MinSpace</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>src;$(SolutionDir)src;$(SolutionDir)dep\skse64;$(SolutionDir)dep\skse64\skse;$(SolutionDir)dep\boost;$(SolutionDir)dep\googletest\googletest\googletest\include;$(SolutionDir)dep\jansson\jansson\src;$(SolutionDir)dep\jansson;$(SolutionDir)dep\luajit\luajit-2.0\src;$(ProjectDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>src;$(SolutionDir)src;$(SolutionDir)dep\skse64;$(SolutionDir)dep\skse64\skse;$(SolutionDir)\dep\skse64\common;$(SolutionDir)dep\boost;$(SolutionDir)dep\googletest\googletest\googletest\include;$(SolutionDir)dep\jansson\jansson\src;$(SolutionDir)dep\jansson;$(SolutionDir)dep\luajit\luajit-2.0\src;$(ProjectDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING;_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING; _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;GTEST_LANG_CXX11;GTEST_HAS_TR1_TUPLE=0;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;BOOST_HAS_HASH;NO_JC_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -385,7 +385,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>src;$(SolutionDir)src;$(SolutionDir)dep\skse64;$(SolutionDir)dep\boost;$(SolutionDir)dep\skse64\skse;$(SolutionDir)dep\googletest\googletest\googletest\include;$(SolutionDir)dep\jansson\jansson\src;$(SolutionDir)dep\jansson;$(SolutionDir)dep\luajit\luajit-2.0\src;$(ProjectDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>src;$(SolutionDir)src;$(SolutionDir)dep\skse64;$(SolutionDir)dep\boost;$(SolutionDir)dep\skse64\skse;$(SolutionDir)\dep\skse64\common;$(SolutionDir)dep\googletest\googletest\googletest\include;$(SolutionDir)dep\jansson\jansson\src;$(SolutionDir)dep\jansson;$(SolutionDir)dep\luajit\luajit-2.0\src;$(ProjectDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING;_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING; _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;GTEST_LANG_CXX11;GTEST_HAS_TR1_TUPLE=0;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;BOOST_HAS_HASH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>

diff --git a/src/api_usage_example/api_usage_example.vcxproj b/src/api_usage_example/api_usage_example.vcxproj
@@ -188,7 +188,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)\dep\skse64;$(SolutionDir)\dep\skse64\skse;$(SolutionDir)\src\JContainers\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\dep\skse64;$(SolutionDir)\dep\skse64\skse;$(SolutionDir)\dep\skse64\common;$(SolutionDir)\src\JContainers\src</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -260,7 +260,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)\dep\skse64;$(SolutionDir)\dep\skse64\skse;$(SolutionDir)\src\JContainers\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\dep\skse64;$(SolutionDir)\dep\skse64\skse;$(SolutionDir)\dep\skse64\common;$(SolutionDir)\src\JContainers\src</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>