Work on the dependencies for the utils folder.

intorr · Xottab-DUTY · commit ce688d2dfe95 · 2017-12-24T02:59:21.000+05:00
diff --git a/src/utils/mp_balancer/entry_point.cpp b/src/utils/mp_balancer/entry_point.cpp
@@ -2,8 +2,6 @@
 #include "wpn_collection.hpp"
 #include "statistics_collector.hpp"
 
-#pragma comment(lib, "xrCore.LIB")
-
 void main(int argc, char* argv[])
 {
     Core._initialize("mp_ballancer", NULL, TRUE, "fsgame4mpu.ltx");
diff --git a/src/utils/mp_configs_verifyer/entry_point.cpp b/src/utils/mp_configs_verifyer/entry_point.cpp
@@ -1,8 +1,6 @@
 #include "pch.h"
 #include "configs_dump_verifyer.h"
 
-#pragma comment(lib, "xrCore.lib")
-
 static char const* help_msg =
     "Format: mp_configs_verifyer.exe [--file | --unpack | --io_filter | --help] [file name]\n"
     "Keys:\n"
diff --git a/src/utils/mp_screenshots_info/entry_point.cpp b/src/utils/mp_screenshots_info/entry_point.cpp
@@ -2,8 +2,6 @@
 #include "screenshots_writer.h"
 #include "screenshots_reader.h"
 
-#pragma comment(lib, "xrCore.lib")
-
 void print_format() { printf("Format: mp_screenshots_info.exe [screenshot_file_name]\n"); };
 void xrcore_log_cb(void* context, LPCSTR log_string) { printf("%s\n", log_string); };
 u8* ss_buffer = NULL;
diff --git a/src/utils/xrAI/compiler.h b/src/utils/xrAI/compiler.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#pragma comment(lib, "FreeImage.lib")
-
 #include "xrCDB/xrCDB.h"
 #include "Common/LevelStructure.hpp"
 #include "AIMapExport.h"
diff --git a/src/utils/xrDXT/NormalMapGen.cpp b/src/utils/xrDXT/NormalMapGen.cpp
@@ -9,7 +9,6 @@ using namespace xray_nvi;
 #ifdef XR_DXT_DBG_BUMP_STAGES_DIR
 #include "xrCore/Media/Image.hpp"
 using namespace XRay::Media;
-#pragma comment(lib, "xrCore.lib")
 #endif
 
 enum KernelType
diff --git a/src/utils/xrLC/Build.h b/src/utils/xrLC/Build.h
@@ -2,7 +2,7 @@
 #include "xrCore/FS.h"
 #include "utils/Shader_xrLC.h"
 struct STextureParams;
-#pragma comment(lib, "dxt.lib")
+
 extern "C" bool XR_IMPORT __stdcall DXTCompress(
     LPCSTR out_name, u8* raw_data, u8* normal_map, u32 w, u32 h, u32 pitch, STextureParams* fmt, u32 depth);
 
diff --git a/src/utils/xrLC/OGF_Face_Save.cpp b/src/utils/xrLC/OGF_Face_Save.cpp
@@ -121,8 +121,6 @@ struct r1v_vert
 };
 #pragma pack(pop)
 
-#pragma comment(lib, "ETools.lib")
-
 void OGF::Save(IWriter& fs)
 {
     OGF_Base::Save(fs);
diff --git a/src/utils/xrLC/OGF_Face_Sphere.cpp b/src/utils/xrLC/OGF_Face_Sphere.cpp
@@ -5,8 +5,6 @@
 #pragma warning(disable : 4995)
 #include <MgcCont3DMinSphere.h>
 
-#pragma comment(lib, "MagicFM.lib")
-
 BOOL f_valid(float f) { return _finite(f) && !_isnan(f); }
 BOOL SphereValid(xr_vector<Fvector>& geom, Fsphere& test)
 {
diff --git a/src/utils/xrLC/xrLC.cpp b/src/utils/xrLC/xrLC.cpp
@@ -12,11 +12,7 @@
 #pragma comment(lib, "d3dx9.lib")
 #pragma comment(lib, "IMAGEHLP.LIB")
 #pragma comment(lib, "winmm.LIB")
-#pragma comment(lib, "xrCDB.lib")
 #pragma comment(lib, "FreeImage.lib")
-#pragma comment(lib, "xrCore.lib")
-#pragma comment(lib, "xrLC_Light.lib")
-#pragma comment(lib, "xrLCUtil.lib")
 
 CBuild* pBuild = NULL;
 u32 version = 0;
diff --git a/src/utils/xrLC/xrLC.vcxproj b/src/utils/xrLC/xrLC.vcxproj
@@ -290,7 +290,7 @@
     <ClCompile Include="xrPhase_GI.cpp" />
     <ClCompile Include="xrPhase_MergeGeometry.cpp" />
     <ClCompile Include="xrPhase_MergeLM.cpp" />
-    <ClCompile Include="xrPhase_MergeLM_Surface.cpp" />    
+    <ClCompile Include="xrPhase_MergeLM_Surface.cpp" />
     <ClCompile Include="xrPhase_ResolveMaterials.cpp" />
     <ClCompile Include="xrPhase_Subdivide.cpp" />
     <ClCompile Include="xrPhase_TangentBasis.cpp" />
@@ -302,9 +302,30 @@
     <ClCompile Include="xrT_Junction.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Externals\MagicFM.vcxproj">
+      <Project>{848e8ab3-9962-4c04-b813-5690399c8a3e}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\xrCDB\xrCDB.vcxproj">
+      <Project>{a19b1df2-82ec-4364-8bdf-85d13a1c89b5}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\xrCore\xrCore.vcxproj">
+      <Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\ETools\ETools.vcxproj">
+      <Project>{65cbb9d0-fbc6-41a4-8316-f5e9b5d7fb33}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\xrLCUtil\xrLCUtil.vcxproj">
+      <Project>{b90bdc22-a891-4b33-b562-29d701f65dbd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\xrLC_Light\xrLC_Light.vcxproj">
+      <Project>{efb76d6f-0092-439c-a783-c0be10bd17c9}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\xrMiscMath\xrMiscMath.vcxproj">
       <Project>{7885cf3c-ee04-4c67-9467-1fbf9a36b037}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\xrQSlim\xrQSlim.vcxproj">
+      <Project>{f1836ce2-59ef-4189-8b9c-d103a511cb27}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/src/utils/xrLC/xrOptimizeCFORM_qslim.cpp b/src/utils/xrLC/xrOptimizeCFORM_qslim.cpp
@@ -5,8 +5,6 @@
 #include "xrCDB/xrCDB.h"
 #include "common/face_smoth_flags.h"
 
-#pragma comment(lib, "xrQSlim.lib")
-
 #define MAX_DECIMATE_ERROR 0.0005f
 #define COMPACTNESS_RATIO 0.001f
 
diff --git a/src/utils/xrLCUtil/xrLCUtil.hpp b/src/utils/xrLCUtil/xrLCUtil.hpp
@@ -1,6 +1,5 @@
 #pragma once
 #include "xrCore/xrCore.h"
-#pragma comment(lib, "xrCore.lib")
 #pragma comment(lib, "winmm.lib")
 #pragma comment(lib, "comctl32.lib")
 
diff --git a/src/utils/xrLC_Light/Lightmap.cpp b/src/utils/xrLC_Light/Lightmap.cpp
@@ -11,7 +11,7 @@
 #include "xrface.h"
 #include "serialize.h"
 #include "ETextureParams.h"
-#pragma comment(lib, "dxt.lib")
+
 extern "C" bool __declspec(dllimport) __stdcall DXTCompress(
     LPCSTR out_name, u8* raw_data, u8* normal_map, u32 w, u32 h, u32 pitch, STextureParams* fmt, u32 depth);
 
diff --git a/src/utils/xrLC_Light/xrLC_Light.cpp b/src/utils/xrLC_Light/xrLC_Light.cpp
@@ -2,10 +2,9 @@
 //
 #include "stdafx.h"
 #include "xrLc_globaldata.h"
-#pragma comment(lib, "xrCore.lib")
-#pragma comment(lib, "xrCDB.lib")
+
 #pragma comment(lib, "FreeImage.lib")
-#pragma comment(lib, "xrLCUtil.lib")
+
 #ifdef _MANAGED
 #pragma managed(push, off)
 #endif
diff --git a/src/utils/xrLC_Light/xrLC_Light.vcxproj b/src/utils/xrLC_Light/xrLC_Light.vcxproj
@@ -395,6 +395,12 @@
     <ProjectReference Include="..\..\..\Externals\zlib.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\xrDXT\DXT.vcxproj">
+      <Project>{ebf9b543-0830-4866-9b48-dc0740e87e8a}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\xrLCUtil\xrLCUtil.vcxproj">
+      <Project>{b90bdc22-a891-4b33-b562-29d701f65dbd}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\xrMiscMath\xrMiscMath.vcxproj">
       <Project>{7885cf3c-ee04-4c67-9467-1fbf9a36b037}</Project>
     </ProjectReference>
diff --git a/src/utils/xrLC_LightStab/xrLC_LightStab.cpp b/src/utils/xrLC_LightStab/xrLC_LightStab.cpp
@@ -3,8 +3,6 @@
 
 #include "utils/xrLC_Light/lightstab_interface.h"
 
-#pragma comment(lib, "xrLC_Light.lib")
-
 extern "C" XRLC_LIGHT_STUB_API bool __cdecl RunTask(
     IAgent* agent, DWORD sessionId, IGenericStream* inStream, IGenericStream* outStream)
 {

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,6 @@`
`2`	`2`	`#include "wpn_collection.hpp"`
`3`	`3`	`#include "statistics_collector.hpp"`
`4`	`4`
`5`		`-#pragma comment(lib, "xrCore.LIB")`
`6`		`-`
`7`	`5`	`void main(int argc, char* argv[])`
`8`	`6`	`{`
`9`	`7`	`Core._initialize("mp_ballancer", NULL, TRUE, "fsgame4mpu.ltx");`
Original file line number	Diff line number	Diff line change
`@@ -121,8 +121,6 @@ struct r1v_vert`
`121`	`121`	`};`
`122`	`122`	`#pragma pack(pop)`
`123`	`123`
`124`		`-#pragma comment(lib, "ETools.lib")`
`125`		`-`
`126`	`124`	`void OGF::Save(IWriter& fs)`
`127`	`125`	`{`
`128`	`126`	`OGF_Base::Save(fs);`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@`
`5`	`5`	`#pragma warning(disable : 4995)`
`6`	`6`	`#include <MgcCont3DMinSphere.h>`
`7`	`7`
`8`		`-#pragma comment(lib, "MagicFM.lib")`
`9`		`-`
`10`	`8`	`BOOL f_valid(float f) { return _finite(f) && !_isnan(f); }`
`11`	`9`	`BOOL SphereValid(xr_vector<Fvector>& geom, Fsphere& test)`
`12`	`10`	`{`