Fixed Custom Build Step not properly detecting changes in DLLs - the …

…bin-vc14 folder should now always have up-to-date files after a build. Moved LoadSettings call to earlier than it previously was so that it precedes Startup plugin calls. Modified IniGetB to recognize both "true"/"false" and "yes"/"no".
Nekura · Jan 18, 2016 · 8ccae87 · 8ccae87
1 parent 6888891
commit 8ccae87
Show file tree

Hide file tree

Showing 37 changed files with 33 additions and 10 deletions.
diff --git a/bin-vc14/FLHook.dll b/bin-vc14/FLHook.dll
diff --git a/bin-vc14/FLHook.pdb b/bin-vc14/FLHook.pdb
diff --git a/bin-vc14/flhook_plugins/ahookext.dll b/bin-vc14/flhook_plugins/ahookext.dll
diff --git a/bin-vc14/flhook_plugins/ahookext.pdb b/bin-vc14/flhook_plugins/ahookext.pdb
diff --git a/bin-vc14/flhook_plugins/base.dll b/bin-vc14/flhook_plugins/base.dll
diff --git a/bin-vc14/flhook_plugins/base.pdb b/bin-vc14/flhook_plugins/base.pdb
diff --git a/bin-vc14/flhook_plugins/cloak.dll b/bin-vc14/flhook_plugins/cloak.dll
diff --git a/bin-vc14/flhook_plugins/cloak.pdb b/bin-vc14/flhook_plugins/cloak.pdb
diff --git a/bin-vc14/flhook_plugins/condata.dll b/bin-vc14/flhook_plugins/condata.dll
diff --git a/bin-vc14/flhook_plugins/condata.pdb b/bin-vc14/flhook_plugins/condata.pdb
diff --git a/bin-vc14/flhook_plugins/conn.dll b/bin-vc14/flhook_plugins/conn.dll
diff --git a/bin-vc14/flhook_plugins/conn.pdb b/bin-vc14/flhook_plugins/conn.pdb
diff --git a/bin-vc14/flhook_plugins/event.dll b/bin-vc14/flhook_plugins/event.dll
diff --git a/bin-vc14/flhook_plugins/event.pdb b/bin-vc14/flhook_plugins/event.pdb
diff --git a/bin-vc14/flhook_plugins/minecontrol.dll b/bin-vc14/flhook_plugins/minecontrol.dll
diff --git a/bin-vc14/flhook_plugins/minecontrol.pdb b/bin-vc14/flhook_plugins/minecontrol.pdb
diff --git a/bin-vc14/flhook_plugins/mobiledock.dll b/bin-vc14/flhook_plugins/mobiledock.dll
diff --git a/bin-vc14/flhook_plugins/mobiledock.pdb b/bin-vc14/flhook_plugins/mobiledock.pdb
diff --git a/bin-vc14/flhook_plugins/playercntl.dll b/bin-vc14/flhook_plugins/playercntl.dll
diff --git a/bin-vc14/flhook_plugins/playercntl.pdb b/bin-vc14/flhook_plugins/playercntl.pdb
diff --git a/bin-vc14/flhook_plugins/tempban.dll b/bin-vc14/flhook_plugins/tempban.dll
diff --git a/bin-vc14/flhook_plugins/tempban.pdb b/bin-vc14/flhook_plugins/tempban.pdb
diff --git a/plugins/base_plugin/Base Plugin.vc14.vcxproj b/plugins/base_plugin/Base Plugin.vc14.vcxproj
@@ -67,6 +67,7 @@
 copy /Y $(OutDir)$(TargetName).dll C:\Discovery\FreelancerSDK\EXE\flhook_plugins\$(TargetName).dll
 </Command>
       <Outputs>..\..\bin-vc14\flhook_plugins\$(TargetName).dll;%(Outputs)</Outputs>
+      <Inputs>$(OutDir)$(TargetName).dll</Inputs>
     </CustomBuildStep>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -101,6 +102,7 @@ copy /Y $(OutDir)$(TargetName).dll C:\Discovery\FreelancerSDK\EXE\flhook_plugins
 copy /Y $(OutDir)$(TargetName).pdb  ..\..\bin-vc14\flhook_plugins\
 </Command>
       <Outputs>..\..\bin-vc14\flhook_plugins\$(TargetName).dll;..\..\bin-vc14\flhook_plugins\$(TargetName).pdb;%(Outputs)</Outputs>
+      <Inputs>$(OutDir)$(TargetName).dll</Inputs>
     </CustomBuildStep>
     <ClCompile>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

diff --git a/plugins/cloak_plugin/Cloak Plugin.vc14.vcxproj b/plugins/cloak_plugin/Cloak Plugin.vc14.vcxproj
@@ -70,6 +70,7 @@ copy /Y C:\Development\flhookplugin\trunk\plugins\flhookplugin_sdk\headers\*.h h
 copy /Y $(OutDir)$(TargetName).dll C:\Discovery\FreelancerSDK\EXE\flhook_plugins\$(TargetName).dll
 </Command>
       <Outputs>..\..\bin-vc14\flhook_plugins\$(TargetName).dll;%(Outputs)</Outputs>
+      <Inputs>$(OutDir)$(TargetName).dll</Inputs>
     </CustomBuildStep>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -106,6 +107,7 @@ copy /Y $(OutDir)$(TargetName).dll C:\Discovery\FreelancerSDK\EXE\flhook_plugins
 copy /Y $(OutDir)$(TargetName).pdb  ..\..\bin-vc14\flhook_plugins\
 </Command>
       <Outputs>..\..\bin-vc14\flhook_plugins\$(TargetName).dll;..\..\bin-vc14\flhook_plugins\$(TargetName).pdb;%(Outputs)</Outputs>
+      <Inputs>$(OutDir)$(TargetName).dll</Inputs>
     </CustomBuildStep>
     <ClCompile>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

diff --git a/plugins/condata/FLHook Example Plugin.vc14.vcxproj b/plugins/condata/FLHook Example Plugin.vc14.vcxproj
@@ -63,6 +63,7 @@
 copy /Y $(OutDir)$(TargetName).dll  "C:\Program Files\Microsoft Games\Freelancer\EXE\flhook_plugins\$(TargetName).dll"
 </Command>
       <Outputs>..\..\bin-vc14\flhook_plugins\$(TargetName).dll;%(Outputs)</Outputs>
+      <Inputs>$(OutDir)$(TargetName).dll</Inputs>
     </CustomBuildStep>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -95,6 +96,7 @@ copy /Y $(OutDir)$(TargetName).dll  "C:\Program Files\Microsoft Games\Freelancer
 copy /Y $(OutDir)$(TargetName).pdb  ..\..\bin-vc14\flhook_plugins\
 </Command>
       <Outputs>..\..\bin-vc14\flhook_plugins\$(TargetName).dll;..\..\bin-vc14\flhook_plugins\$(TargetName).pdb;%(Outputs)</Outputs>
+      <Inputs>$(OutDir)$(TargetName).dll</Inputs>
     </CustomBuildStep>
     <ClCompile>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

diff --git a/plugins/conn_plugin/Conn Plugin.vc14.vcxproj b/plugins/conn_plugin/Conn Plugin.vc14.vcxproj
@@ -68,6 +68,7 @@
 copy /Y $(OutDir)$(TargetName).dll C:\Discovery\FreelancerSDK\EXE\flhook_plugins
 </Command>
       <Outputs>C:\Development\flhookplugin\trunk\bin-vc14\flhook_plugins\$(TargetName).dll;C:\Discovery\FreelancerSDK\EXE\flhook_plugins\$(TargetName).dll;%(Outputs)</Outputs>
+      <Inputs>$(OutDir)$(TargetName).dll</Inputs>
     </CustomBuildStep>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -104,6 +105,7 @@ copy /Y $(OutDir)$(TargetName).dll C:\Discovery\FreelancerSDK\EXE\flhook_plugins
 copy /Y $(OutDir)$(TargetName).pdb  ..\..\bin-vc14\flhook_plugins\
 </Command>
       <Outputs>..\..\bin-vc14\flhook_plugins\$(TargetName).dll;..\..\bin-vc14\flhook_plugins\$(TargetName).pdb;%(Outputs)</Outputs>
+      <Inputs>$(OutDir)$(TargetName).dll</Inputs>
     </CustomBuildStep>
     <ClCompile>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

diff --git a/plugins/event_plugin/Event Plugin.vc14.vcxproj b/plugins/event_plugin/Event Plugin.vc14.vcxproj
@@ -66,6 +66,7 @@
 copy /Y $(OutDir)$(TargetName).dll C:\Discovery\FreelancerSDK\EXE\flhook_plugins
 </Command>
       <Outputs>..\..\bin-vc14\flhook_plugins\$(TargetName).dll;C:\Discovery\FreelancerSDK\EXE\flhook_plugins\$(TargetName).dll;%(Outputs)</Outputs>
+      <Inputs>$(OutDir)$(TargetName).dll</Inputs>
     </CustomBuildStep>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -101,6 +102,7 @@ copy /Y $(OutDir)$(TargetName).dll C:\Discovery\FreelancerSDK\EXE\flhook_plugins
 copy /Y $(OutDir)$(TargetName).pdb  ..\..\bin-vc14\flhook_plugins\
 </Command>
       <Outputs>..\..\bin-vc14\flhook_plugins\$(TargetName).dll;..\..\bin-vc14\flhook_plugins\$(TargetName).pdb;%(Outputs)</Outputs>
+      <Inputs>$(OutDir)$(TargetName).dll</Inputs>
     </CustomBuildStep>
     <ClCompile>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

diff --git a/plugins/flhookplugin_sdk/libs/FLHook-vc14.lib b/plugins/flhookplugin_sdk/libs/FLHook-vc14.lib
diff --git a/plugins/hookext_plugin/HookExt Plugin.vc14.vcxproj b/plugins/hookext_plugin/HookExt Plugin.vc14.vcxproj
@@ -71,6 +71,7 @@ copy /Y C:\Development\flhookplugin\trunk\plugins\flhookplugin_sdk\headers\*.h h
 copy /Y $(OutDir)$(TargetName).dll C:\Discovery\FreelancerSDK\EXE\flhook_plugins
 </Command>
       <Outputs>C:\Development\flhookplugin\trunk\bin-vc14\flhook_plugins\$(TargetName).dll;C:\Discovery\FreelancerSDK\EXE\flhook_plugins\$(TargetName).dll;%(Outputs)</Outputs>
+      <Inputs>$(OutDir)$(TargetName).dll</Inputs>
     </CustomBuildStep>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -106,6 +107,7 @@ copy /Y $(OutDir)$(TargetName).dll C:\Discovery\FreelancerSDK\EXE\flhook_plugins
 copy /Y $(OutDir)$(TargetName).pdb  ..\..\bin-vc14\flhook_plugins\
 </Command>
       <Outputs>..\..\bin-vc14\flhook_plugins\$(TargetName).dll;..\..\bin-vc14\flhook_plugins\$(TargetName).pdb;%(Outputs)</Outputs>
+      <Inputs>$(OutDir)$(TargetName).dll</Inputs>
     </CustomBuildStep>
     <ClCompile>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

diff --git a/plugins/minecontrol_plugin/MineControl Plugin.vc14.vcxproj b/plugins/minecontrol_plugin/MineControl Plugin.vc14.vcxproj
@@ -67,6 +67,7 @@
 copy /Y $(OutDir)$(TargetName).dll C:\Discovery\FreelancerSDK\EXE\flhook_plugins
 </Command>
       <Outputs>..\..\bin-vc14\flhook_plugins\$(TargetName).dll;C:\Discovery\FreelancerSDK\EXE\flhook_plugins\$(TargetName).dll;%(Outputs)</Outputs>
+      <Inputs>$(OutDir)$(TargetName).dll</Inputs>
     </CustomBuildStep>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -103,6 +104,7 @@ copy /Y $(OutDir)$(TargetName).dll C:\Discovery\FreelancerSDK\EXE\flhook_plugins
 copy /Y $(OutDir)$(TargetName).pdb  ..\..\bin-vc14\flhook_plugins\
 </Command>
       <Outputs>..\..\bin-vc14\flhook_plugins\$(TargetName).dll;..\..\bin-vc14\flhook_plugins\$(TargetName).pdb;%(Outputs)</Outputs>
+      <Inputs>$(OutDir)$(TargetName).dll</Inputs>
     </CustomBuildStep>
     <ClCompile>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

diff --git a/plugins/mobiledocking_plugin/MobileDocking Plugin.vc14.vcxproj b/plugins/mobiledocking_plugin/MobileDocking Plugin.vc14.vcxproj
@@ -68,6 +68,7 @@
 copy /Y $(OutDir)$(TargetName).dll C:\Discovery\FreelancerSDK\EXE\flhook_plugins
 </Command>
       <Outputs>..\..\bin-vc14\flhook_plugins\$(TargetName).dll;C:\Discovery\FreelancerSDK\EXE\flhook_plugins\$(TargetName).dll;%(Outputs)</Outputs>
+      <Inputs>$(OutDir)$(TargetName).dll</Inputs>
     </CustomBuildStep>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -104,6 +105,7 @@ copy /Y $(OutDir)$(TargetName).dll C:\Discovery\FreelancerSDK\EXE\flhook_plugins
 copy /Y $(OutDir)$(TargetName).pdb  ..\..\bin-vc14\flhook_plugins\
 </Command>
       <Outputs>..\..\bin-vc14\flhook_plugins\$(TargetName).dll;..\..\bin-vc14\flhook_plugins\$(TargetName).pdb;%(Outputs)</Outputs>
+      <Inputs>$(OutDir)$(TargetName).dll</Inputs>
     </CustomBuildStep>
     <ClCompile>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

diff --git a/plugins/playercntl_plugin/src/Player Control Plugin.vc14.vcxproj b/plugins/playercntl_plugin/src/Player Control Plugin.vc14.vcxproj
@@ -67,6 +67,7 @@
 copy /Y $(OutDir)$(TargetName).dll C:\Discovery\FreelancerSDK\EXE\flhook_plugins\$(TargetName).dll
 </Command>
       <Outputs>..\..\..\bin-vc14\flhook_plugins\$(TargetName).dll;C:\Discovery\FreelancerSDK\EXE\flhook_plugins\$(TargetName).dll;%(Outputs)</Outputs>
+      <Inputs>$(OutDir)$(TargetName).dll</Inputs>
     </CustomBuildStep>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -102,6 +103,7 @@ copy /Y $(OutDir)$(TargetName).dll C:\Discovery\FreelancerSDK\EXE\flhook_plugins
 copy /Y $(OutDir)$(TargetName).pdb  ..\..\..\bin-vc14\flhook_plugins\
 </Command>
       <Outputs>..\..\..\bin-vc14\flhook_plugins\$(TargetName).dll;..\..\..\bin-vc14\flhook_plugins\$(TargetName).pdb;%(Outputs)</Outputs>
+      <Inputs>$(OutDir)$(TargetName).dll</Inputs>
     </CustomBuildStep>
     <ClCompile>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;__NOINCFLHOOKLIBS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>

diff --git a/plugins/tempban/Tempban Plugin.vc14.vcxproj b/plugins/tempban/Tempban Plugin.vc14.vcxproj
@@ -62,6 +62,7 @@
 copy /Y $(OutDir)$(TargetName).pdb  ..\..\bin-vc14\flhook_plugins\
 </Command>
       <Outputs>..\..\bin-vc14\flhook_plugins\$(TargetName).dll;%(Outputs)</Outputs>
+      <Inputs>$(OutDir)$(TargetName).dll</Inputs>
     </CustomBuildStep>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -94,6 +95,7 @@ copy /Y $(OutDir)$(TargetName).pdb  ..\..\bin-vc14\flhook_plugins\
 copy /Y $(OutDir)$(TargetName).pdb  ..\..\bin-vc14\flhook_plugins\
 </Command>
       <Outputs>..\..\bin-vc14\flhook_plugins\$(TargetName).dll;..\..\bin-vc14\flhook_plugins\$(TargetName).pdb;%(Outputs)</Outputs>
+      <Inputs>$(OutDir)$(TargetName).dll</Inputs>
     </CustomBuildStep>
     <ClCompile>
       <ExceptionHandling>Async</ExceptionHandling>

diff --git a/project-vc14/FLHook.vcxproj b/project-vc14/FLHook.vcxproj
@@ -63,6 +63,7 @@ copy /Y $(OutDir)$(TargetName).lib  ..\plugins\flhookplugin_sdk\libs\
 
 </Command>
       <Outputs>..\bin-vc14\$(TargetName).dll;..\plugins\flhookplugin_sdk\libs\$(TargetName).lib;%(Outputs)</Outputs>
+      <Inputs>$(OutDir)$(TargetName).dll</Inputs>
     </CustomBuildStep>
     <ClCompile>
       <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
@@ -98,6 +99,7 @@ copy /Y  $(OutDir)$(TargetName).pdb  ..\bin-vc14\
 copy /Y  $(OutDir)$(TargetName).lib  ..\plugins\flhookplugin_sdk\libs\$(TargetName)-vc14.lib
 </Command>
       <Outputs>..\bin-vc14\$(TargetName).dll;..\plugins\flhookplugin_sdk\libs\$(TargetName).lib;%(Outputs)</Outputs>
+      <Inputs>$(OutDir)$(TargetName).dll</Inputs>
     </CustomBuildStep>
     <ClCompile>
       <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>

diff --git a/project-vc14/FLHook.vcxproj.filters b/project-vc14/FLHook.vcxproj.filters
@@ -190,6 +190,6 @@
     </Text>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\bin-vc12\FLHook.ini" />
+    <None Include="..\bin-vc14\FLHook.ini" />
   </ItemGroup>
 </Project>
diff --git a/source/FLHook.cpp b/source/FLHook.cpp
@@ -284,6 +284,14 @@ void FLHookInit_Pre()
 		}
 #endif
 
+		// load settings
+		LoadSettings();
+
+		if (set_bDebug && !fLogDebug)
+			fLogDebug = fopen(sDebugLog.c_str(), "at");
+
+		CALL_PLUGINS_NORET(PLUGIN_LoadSettings, , (), ());
+
 	} catch(char *szError) {
 		ConPrint(L"CRITICAL ERROR: %s\n", stows(szError).c_str());
 		exit(EXIT_FAILURE);
@@ -312,14 +320,6 @@ bool FLHookInit()
 			throw "content.dll not loaded";
 		if(!(hMe = GetModuleHandle("FLHook")))
 			throw "FLHook.dll not loaded";
-
-		// load settings
-		LoadSettings();
-
-		if (set_bDebug && !fLogDebug)
-			fLogDebug = fopen(sDebugLog.c_str(), "at");
-
-		CALL_PLUGINS_NORET(PLUGIN_LoadSettings, , (), ());
 
 		// init hooks
 		if(!InitHookExports())

diff --git a/source/Tools.cpp b/source/Tools.cpp
@@ -129,7 +129,8 @@ float IniGetF(const string &scFile, const string &scApp, const string &scKey, fl
 
 bool IniGetB(const string &scFile, const string &scApp, const string &scKey, bool bDefault)
 {
-	return ToLower(IniGetS(scFile, scApp, scKey, bDefault ? "yes" : "no")).compare("yes") == 0 ? true : false;
+	string val = ToLower(IniGetS(scFile, scApp, scKey, bDefault ? "true" : "false"));
+	return val.compare("yes") == 0 || val.compare("true") == 0 ? true : false;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////