Skip to content

Commit 6266418

Browse files
deccerdeccer
committed
Cleanup FreeImage dependencies
1 parent c8c5ac8 commit 6266418

File tree

8 files changed

+45
-19
lines changed

8 files changed

+45
-19
lines changed

‎src/Cpp/1-getting-started/1-3-1-RasterizerState/1-3-1-RasterizerState.vcxproj‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,7 @@
7474
<IgnoreSpecificDefaultLibraries>msvcrt</IgnoreSpecificDefaultLibraries>
7575
</Link>
7676
<PostBuildEvent>
77-
<Command>xcopy /Y $(SolutionDir)..\lib\assimp\lib\assimp.dll $(OutDir)
78-
mkdir $(OutDir)Assets\Models\
79-
mkdir $(OutDir)Assets\Shaders\
80-
mkdir $(OutDir)Assets\Textures\
81-
xcopy /Y $(ProjectDir)Assets\Models\*.* $(OutDir)\Assets\Models\
82-
xcopy /Y $(ProjectDir)Assets\Shaders\*.* $(OutDir)Assets\Shaders\
83-
xcopy /Y $(ProjectDir)Assets\Textures\*.* $(OutDir)Assets\Textures\</Command>
77+
<Command>xcopy /E /Y $(OutDir)Assets $(ProjectDir)Assets\</Command>
8478
</PostBuildEvent>
8579
</ItemDefinitionGroup>
8680
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -103,13 +97,7 @@ xcopy /Y $(ProjectDir)Assets\Textures\*.* $(OutDir)Assets\Textures\</Command>
10397
</IgnoreSpecificDefaultLibraries>
10498
</Link>
10599
<PostBuildEvent>
106-
<Command>xcopy /Y $(SolutionDir)..\lib\assimp\lib\assimp.dll $(OutDir)
107-
mkdir $(OutDir)Assets\Models\
108-
mkdir $(OutDir)Assets\Shaders\
109-
mkdir $(OutDir)Assets\Textures\
110-
xcopy /Y $(ProjectDir)Assets\Models\*.* $(OutDir)\Assets\Models\
111-
xcopy /Y $(ProjectDir)Assets\Shaders\*.* $(OutDir)Assets\Shaders\
112-
xcopy /Y $(ProjectDir)Assets\Textures\*.* $(OutDir)Assets\Textures\</Command>
100+
<Command>xcopy /E /Y $(OutDir)Assets $(ProjectDir)Assets\</Command>
113101
</PostBuildEvent>
114102
</ItemDefinitionGroup>
115103
<ItemGroup>

‎src/Cpp/1-getting-started/1-3-4-3DRendering/3DRenderingApplication.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@
1717
#pragma comment(lib, "winmm.lib")
1818
#pragma comment(lib, "dxguid.lib")
1919

20+
#if defined(_DEBUG)
21+
#pragma comment(lib, "FreeImageLibd.lib")
22+
#else
23+
#pragma comment(lib, "FreeImageLib.lib")
24+
#endif
2025

2126
template <UINT TDebugNameLength>
2227
inline void SetDebugName(_In_ ID3D11DeviceChild* deviceResource, _In_z_ const char(&debugName)[TDebugNameLength])

‎src/Cpp/1-getting-started/1-3-5-Models-Refactored/1-3-5-Models-Refactored.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<Link>
6969
<SubSystem>Console</SubSystem>
7070
<GenerateDebugInformation>true</GenerateDebugInformation>
71-
<AdditionalDependencies>Framework.lib;assimp.lib;FreeImage.lib;DirectXTex.lib;glfw3.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>
71+
<AdditionalDependencies>Framework.lib;assimp.lib;DirectXTex.lib;glfw3.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>
7272
<IgnoreSpecificDefaultLibraries>msvcrt</IgnoreSpecificDefaultLibraries>
7373
</Link>
7474
<PostBuildEvent>
@@ -96,7 +96,7 @@ xcopy /Y $(ProjectDir)Assets\Textures\*.* $(OutDir)Assets\Textures\</Command>
9696
<EnableCOMDATFolding>true</EnableCOMDATFolding>
9797
<OptimizeReferences>true</OptimizeReferences>
9898
<GenerateDebugInformation>true</GenerateDebugInformation>
99-
<AdditionalDependencies>Framework.lib;assimp.lib;FreeImage.lib;DirectXTex.lib;glfw3.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>
99+
<AdditionalDependencies>Framework.lib;assimp.lib;DirectXTex.lib;glfw3.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>
100100
</Link>
101101
<PostBuildEvent>
102102
<Command>xcopy /Y $(SolutionDir)..\lib\assimp\lib\assimp.dll $(OutDir)

‎src/Cpp/1-getting-started/1-3-5-Models-Refactored/LoadingMeshesApplication.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@
2020
#pragma comment(lib, "winmm.lib")
2121
#pragma comment(lib, "dxguid.lib")
2222

23+
#if defined(_DEBUG)
24+
#pragma comment(lib, "FreeImageLibd.lib")
25+
#else
26+
#pragma comment(lib, "FreeImageLib.lib")
27+
#endif
28+
2329
template <UINT TDebugNameLength>
2430
inline void SetDebugName(_In_ ID3D11DeviceChild* deviceResource, _In_z_ const char (&debugName)[TDebugNameLength])
2531
{

‎src/Cpp/1-getting-started/1-3-5-Models/LoadingMeshesApplication.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@
2626
#pragma comment(lib, "winmm.lib")
2727
#pragma comment(lib, "dxguid.lib")
2828

29+
#if defined(_DEBUG)
30+
#pragma comment(lib, "FreeImageLibd.lib")
31+
#else
32+
#pragma comment(lib, "FreeImageLib.lib")
33+
#endif
34+
2935
template <UINT TDebugNameLength>
3036
inline void SetDebugName(_In_ ID3D11DeviceChild* deviceResource, _In_z_ const char (&debugName)[TDebugNameLength])
3137
{

‎src/Cpp/1-getting-started/1-3-5-Models/TextureFactory.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#pragma comment(lib, "FreeImageLib.lib")
1212
#endif
1313

14-
1514
TextureFactory::TextureFactory(const WRL::ComPtr<ID3D11Device>& device)
1615
{
1716
_device = device;

‎src/Cpp/1-getting-started/1-3-7-DearImGui/1-3-7-DearImGui.vcxproj‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@
5050
<IncludePath>$(SolutionDir)..\lib\glfw-3.3.6\include\;$(SolutionDir)..\lib\FreeImage\include\;$(SolutionDir)..\lib\DirectXTex\include\;$(SolutionDir)..\lib\assimp\include\;$(SolutionDir)..\lib\imgui\include\;$(SolutionDir)Cpp\Framework\;</IncludePath>
5151
<LibraryPath>$(SolutionDir)..\lib\glfw-3.3.6\lib-vc2022\;$(SolutionDir)..\lib\DirectXTex\lib\$(Configuration)\;$(SolutionDir)..\lib\FreeImage\lib\;$(SolutionDir)..\lib\assimp\lib\;$(LibraryPath);$(SolutionDir)Cpp\Framework\lib\$(Configuration)\;</LibraryPath>
5252
<SourcePath>$(SourcePath)</SourcePath>
53+
<CustomBuildBeforeTargets>
54+
</CustomBuildBeforeTargets>
5355
</PropertyGroup>
5456
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
5557
<LinkIncremental>false</LinkIncremental>
@@ -58,6 +60,8 @@
5860
<IncludePath>$(SolutionDir)..\lib\glfw-3.3.6\include\;$(SolutionDir)..\lib\FreeImage\include\;$(SolutionDir)..\lib\DirectXTex\include\;$(SolutionDir)..\lib\assimp\include\;$(SolutionDir)..\lib\imgui\include\;$(SolutionDir)Cpp\Framework\;</IncludePath>
5961
<LibraryPath>$(SolutionDir)..\lib\glfw-3.3.6\lib-vc2022\;$(SolutionDir)..\lib\DirectXTex\lib\$(Configuration)\;$(SolutionDir)..\lib\FreeImage\lib\;$(SolutionDir)..\lib\assimp\lib\;$(LibraryPath);$(SolutionDir)Cpp\Framework\lib\$(Configuration)\;</LibraryPath>
6062
<SourcePath>$(SourcePath)</SourcePath>
63+
<CustomBuildBeforeTargets>
64+
</CustomBuildBeforeTargets>
6165
</PropertyGroup>
6266
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
6367
<ClCompile>
@@ -70,7 +74,7 @@
7074
<Link>
7175
<SubSystem>Console</SubSystem>
7276
<GenerateDebugInformation>true</GenerateDebugInformation>
73-
<AdditionalDependencies>Framework.lib;assimp.lib;FreeImage.lib;DirectXTex.lib;glfw3.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>
77+
<AdditionalDependencies>Framework.lib;assimp.lib;DirectXTex.lib;glfw3.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>
7478
<IgnoreSpecificDefaultLibraries>msvcrt</IgnoreSpecificDefaultLibraries>
7579
</Link>
7680
<PostBuildEvent>
@@ -82,6 +86,14 @@ xcopy /Y $(ProjectDir)Assets\Models\*.* $(OutDir)\Assets\Models\
8286
xcopy /Y $(ProjectDir)Assets\Shaders\*.* $(OutDir)Assets\Shaders\
8387
xcopy /Y $(ProjectDir)Assets\Textures\*.* $(OutDir)Assets\Textures\</Command>
8488
</PostBuildEvent>
89+
<CustomBuildStep>
90+
<Command>
91+
</Command>
92+
<Outputs>
93+
</Outputs>
94+
<TreatOutputAsContent>
95+
</TreatOutputAsContent>
96+
</CustomBuildStep>
8597
</ItemDefinitionGroup>
8698
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8799
<ClCompile>
@@ -98,7 +110,7 @@ xcopy /Y $(ProjectDir)Assets\Textures\*.* $(OutDir)Assets\Textures\</Command>
98110
<EnableCOMDATFolding>true</EnableCOMDATFolding>
99111
<OptimizeReferences>true</OptimizeReferences>
100112
<GenerateDebugInformation>true</GenerateDebugInformation>
101-
<AdditionalDependencies>Framework.lib;assimp.lib;FreeImage.lib;DirectXTex.lib;glfw3.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>
113+
<AdditionalDependencies>Framework.lib;assimp.lib;DirectXTex.lib;glfw3.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>
102114
</Link>
103115
<PostBuildEvent>
104116
<Command>xcopy /Y $(SolutionDir)..\lib\assimp\lib\assimp.dll $(OutDir)
@@ -109,6 +121,10 @@ xcopy /Y $(ProjectDir)Assets\Models\*.* $(OutDir)\Assets\Models\
109121
xcopy /Y $(ProjectDir)Assets\Shaders\*.* $(OutDir)Assets\Shaders\
110122
xcopy /Y $(ProjectDir)Assets\Textures\*.* $(OutDir)Assets\Textures\</Command>
111123
</PostBuildEvent>
124+
<CustomBuildStep>
125+
<Command>
126+
</Command>
127+
</CustomBuildStep>
112128
</ItemDefinitionGroup>
113129
<ItemGroup>
114130
<ClCompile Include="..\..\..\..\lib\imgui\include\imgui\backend\imgui_impl_dx11.cpp" />

‎src/Cpp/1-getting-started/1-3-7-DearImGui/DearImGuiApplication.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323
#pragma comment(lib, "winmm.lib")
2424
#pragma comment(lib, "dxguid.lib")
2525

26+
#if defined(_DEBUG)
27+
#pragma comment(lib, "FreeImageLibd.lib")
28+
#else
29+
#pragma comment(lib, "FreeImageLib.lib")
30+
#endif
31+
2632
template <UINT TDebugNameLength>
2733
inline void SetDebugName(_In_ ID3D11DeviceChild* deviceResource, _In_z_ const char (&debugName)[TDebugNameLength])
2834
{

0 commit comments

Comments
 (0)