Small MSVC configuration and code fixes when tried on totally empty f…

…older to build the project
javierhimura · Feb 6, 2018 · 917f0f9 · 917f0f9
1 parent 09ca264
commit 917f0f9
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 16 deletions.
diff --git a/JContainers.sln b/JContainers.sln
@@ -12,6 +12,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json_validator", "json_validator\json_validator.vcxproj", "{CAA7D417-1B58-48AB-A226-C7E69141772C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "API_example", "api_usage_example\api_usage_example.vcxproj", "{6A52E028-EA40-467A-9055-6C7320B2746D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{7028B79C-06E3-4D9A-B38C-1DC3680B1BDB} = {7028B79C-06E3-4D9A-B38C-1DC3680B1BDB}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "post-build", "post-build\post-build.vcxproj", "{7A9BC6AF-C4C0-48EB-AE58-C64270A6823D}"
 EndProject
@@ -52,7 +55,8 @@ Global
 		{C7305D8C-5514-4C58-9ED7-04D1D7A53D8D}.SKSE|x64.Build.0 = Release|x64
 		{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Debug|Win32.Build.0 = Debug|Win32
-		{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Debug|x64.ActiveCfg = Debug|Win32
+		{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Debug|x64.ActiveCfg = Debug|x64
+		{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Debug|x64.Build.0 = Debug|x64
 		{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Distrib|Win32.ActiveCfg = Release|Win32
 		{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Distrib|Win32.Build.0 = Release|Win32
 		{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Distrib|x64.ActiveCfg = Release|Win32
@@ -61,6 +65,7 @@ Global
 		{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Release|Win32.ActiveCfg = Release|Win32
 		{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Release|Win32.Build.0 = Release|Win32
 		{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Release|x64.ActiveCfg = Release|x64
+		{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Release|x64.Build.0 = Release|x64
 		{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.SKSE|Win32.ActiveCfg = Release|Win32
 		{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.SKSE|Win32.Build.0 = Release|Win32
 		{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.SKSE|x64.ActiveCfg = Release|Win32

diff --git a/JContainers/src/collections/tests.h b/JContainers/src/collections/tests.h
@@ -587,7 +587,7 @@ namespace collections { namespace {
             for (auto id : identifiers) {
                 cntEx += (context.getObject(id) ? 1 : 0);
             }
-            jc_debug("%u exist of %u", cntEx, identifiers.size());
+            jc_debug("%zu exist of %zu", cntEx, identifiers.size());
             return cntEx == identifiers.size();
         };
 
@@ -596,7 +596,7 @@ namespace collections { namespace {
             for (auto id : identifiers) {
                 cntDestr += (context.getObject(id) ? 0 : 1);
             }
-            jc_debug("%u destroyed of %u", cntDestr, identifiers.size());
+            jc_debug("%zu destroyed of %zu", cntDestr, identifiers.size());
             return cntDestr == identifiers.size();
         };
 

diff --git a/api_usage_example/Source.cpp b/api_usage_example/Source.cpp
@@ -12,11 +12,11 @@
 
 #include "jc_interface.h"
 
-#include "skse/PluginAPI.h"
-#include "skse/skse_version.h"
-#include "skse/GameForms.h"
-#include "skse/PapyrusNativeFunctions.h"
-#include "skse/PapyrusForm.h"
+#include "skse64/PluginAPI.h"
+#include "skse64_common/skse_version.h"
+#include "skse64/GameForms.h"
+#include "skse64/PapyrusNativeFunctions.h"
+#include "skse64/PapyrusForm.h"
 
 class VMClassRegistry;
 
@@ -118,7 +118,7 @@ extern "C" {
             _MESSAGE("loaded in editor, marking as incompatible");
             return false;
         }
-        else if (skse->runtimeVersion != RUNTIME_VERSION_1_9_32_0) {
+        else if (skse->runtimeVersion != RUNTIME_VERSION_1_5_23) {
             _MESSAGE("unsupported runtime version %08X", skse->runtimeVersion);
             return false;
         }

diff --git a/api_usage_example/api_usage_example.vcxproj b/api_usage_example/api_usage_example.vcxproj
@@ -102,13 +102,16 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(SolutionDir)\dep\skse;$(SolutionDir)\dep;$(SolutionDir)\JContainers\src</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

diff --git a/dep/boost/build_libraries.bat b/dep/boost/build_libraries.bat
@@ -1,3 +1,5 @@
+REM https://sourceforge.net/projects/boost/files/boost/1.66.0/
+
 b2 variant=release link=static threading=multi runtime-link=static --with-serialization --with-date_time --with-filesystem --with-thread --build-dir=garbage --stagedir=boost_lib stage
 
 

diff --git a/dep/common/common.vcxproj b/dep/common/common.vcxproj
@@ -108,7 +108,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../;$(SolutionDir);$(SolutionDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

diff --git a/dep/skse/skse64/skse64.vcxproj b/dep/skse/skse64/skse64.vcxproj
@@ -61,16 +61,19 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;SKSE64_EXPORTS;RUNTIME_VERSION=0x01050170;RUNTIME;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\;..\;$(SolutionDir);$(SolutionDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>common/IPrefix.h</ForcedIncludeFiles>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>common.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
-      <Command>copy "$(TargetPath)" "$(Skyrim64Path)\$(TargetFileName)" /Y</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>Installing DLL...</Message>

diff --git a/dep/skse/skse64_common/skse64_common.vcxproj b/dep/skse/skse64_common/skse64_common.vcxproj
@@ -75,7 +75,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\;..\;$(SolutionDir);$(SolutionDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>common/IPrefix.h</ForcedIncludeFiles>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>

diff --git a/post-build/post-build.vcxproj b/post-build/post-build.vcxproj
@@ -153,7 +153,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
     <PreBuildEvent>
-      <Command>python.exe install_Local.py $(Configuration) "C:\\Games\\Nexus Mod Manager\\SkyrimSE\\JContainers-v3.3A\\JContainers-v3.3A"</Command>
+      <Command>python.exe install_Local.py $(Configuration)  "C:\\Program Files\\Mod Organizer\\mods\\JContainers-v3.3A"</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Distrib|Win32'">
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,5 @@
		REM https://sourceforge.net/projects/boost/files/boost/1.66.0/

		b2 variant=release link=static threading=multi runtime-link=static --with-serialization --with-date_time --with-filesystem --with-thread --build-dir=garbage --stagedir=boost_lib stage


Expand Down