Skip to content

Commit 4f83210

Browse files
author
Antoine ESMAN
committed
fix(windows): compilation on latest release
1 parent fab720e commit 4f83210

File tree

6 files changed

+12
-3
lines changed

6 files changed

+12
-3
lines changed

Raytracer.vcxproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<Link>
121121
<SubSystem>Console</SubSystem>
122122
<GenerateDebugInformation>true</GenerateDebugInformation>
123-
<AdditionalDependencies>libconfig++s.lib;Shlwapi.lib;opengl32.lib;openal32.lib;freetype.lib;winmm.lib;gdi32.lib;flac.lib;vorbisenc.lib;vorbisfile.lib;vorbis.lib;ogg.lib;ws2_32.lib;sfml-graphics-s-d.lib;sfml-window-s-d.lib;sfml-system-s-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
123+
<AdditionalDependencies>libconfigs.lib;Shlwapi.lib;opengl32.lib;openal32.lib;freetype.lib;winmm.lib;gdi32.lib;flac.lib;vorbisenc.lib;vorbisfile.lib;vorbis.lib;ogg.lib;ws2_32.lib;sfml-graphics-s-d.lib;sfml-window-s-d.lib;sfml-system-s-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
124124
<AdditionalLibraryDirectories>$(ProjectDir)lib</AdditionalLibraryDirectories>
125125
</Link>
126126
</ItemDefinitionGroup>
@@ -134,6 +134,9 @@
134134
<ConformanceMode>true</ConformanceMode>
135135
<LanguageStandard>stdcpp20</LanguageStandard>
136136
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
137+
<AdditionalOptions>/wd4244 /wd4267 /wd4305
138+
/wd4834 /wd6031 %(AdditionalOptions)</AdditionalOptions>
139+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
137140
</ClCompile>
138141
<Link>
139142
<SubSystem>Console</SubSystem>
@@ -289,4 +292,4 @@
289292
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
290293
<ImportGroup Label="ExtensionTargets">
291294
</ImportGroup>
292-
</Project>
295+
</Project>

WINDOWS_BUILD.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
To build on windows
2+
3+
- open Raytracer.sln in Visual Studio
4+
- Select Release x64
5+
- Build

lib/libconfig++s.lib

2.22 MB
Binary file not shown.

lib/openal32.lib

32.9 KB
Binary file not shown.

src/scene/interactive/SceneInteraction.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ namespace Raytracer {
4242
#ifdef MACOSTONIO
4343
windowSize = sf::Vector2u(1440, 850);
4444
#else
45-
windowSize = sf::Vector2u(desktop.width, desktop.height);
45+
windowSize = sf::Vector2u(desktop.size.x, desktop.size.y);
4646
#endif
4747
#else
4848
Camera *camera = m_interacCam.getCamera();

src/scene/interactive/imgui/objectSelection/removeSelectedObject.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ namespace Raytracer
4848
default:
4949
break;
5050
}
51+
m_selectedObject = -1;
5152
m_updateBVH = true;
5253
m_needRendering = true;
5354
}

0 commit comments

Comments
 (0)