Skip to content

Fixed linking on MSVC #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BrentDaMage merged 2 commits into from
Jan 5, 2026
Merged

Fixed linking on MSVC #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5aa709
Fixed building on MSVC
BrentDaMage Jan 5, 2026
44cee66
Bonus commit to remove unused OGL header
BrentDaMage Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion platforms/sound/directsound/CustomSoundSystem.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <stdexcept>
#include <vector>

#ifdef _MSVC_VER
#ifdef _MSC_VER
#pragma comment(lib, "dsound.lib")
#pragma comment(lib, "dxguid.lib")
#pragma comment(lib, "winmm.lib")
Expand Down
1 change: 0 additions & 1 deletion source/client/app/NinecraftApp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include "renderer/ConstantBufferMetaDataManager.hpp"
#include "renderer/RenderContextImmediate.hpp"
#include "renderer/RenderMaterial.hpp"
#include "renderer/platform/ogl/Extensions.hpp"

#ifdef DEMO
#include "world/level/storage/MemoryLevelStorageSource.hpp"
Expand Down
2 changes: 1 addition & 1 deletion source/client/gui/Gui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "client/renderer/renderer/RenderMaterialGroup.hpp"
#include "renderer/ShaderConstants.hpp"

#ifdef _MSVC_VER
#ifdef _MSC_VER
#pragma warning(disable : 4244)
#endif

Expand Down
2 changes: 1 addition & 1 deletion source/client/renderer/ScreenRenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "renderer/ShaderConstants.hpp"
#include "client/renderer/Tesselator.hpp"

#ifdef _MSVC_VER
#ifdef _MSC_VER
#pragma warning (disable : 4244)
#endif

Expand Down
2 changes: 1 addition & 1 deletion source/common/Utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <winsock.h>

// Why are we not using GetTickCount64()? It's simple -- getTimeMs has the exact same problem as using regular old GetTickCount.
#ifdef _MSVC_VER
#ifdef _MSC_VER
#pragma warning(disable : 28159)
#endif

Expand Down
2 changes: 1 addition & 1 deletion thirdparty/GL/GL.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
#include <GL/glext.h> // it'll include from a different dir, namely thirdparty/GL/glext.h
#endif

#ifdef _MSVC_VER
#ifdef _MSC_VER
#pragma comment(lib, "opengl32.lib")
#pragma comment(lib, "glu32.lib")
#endif
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/SDL/SDL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#if (defined(_WIN32) || defined(USE_SDL1))
#ifdef _WIN32
#ifdef _MSVC_VER
#ifdef _MSC_VER
#ifdef USE_SDL1
#pragma comment(lib, "SDL.lib")
#else
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/SDL/SDL_opengl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#if (defined(_WIN32) || defined(USE_SDL1))
#ifdef _WIN32
#ifdef _MSVC_VER
#ifdef _MSC_VER
#ifdef USE_SDL1
#pragma comment(lib, "SDL.lib")
#else
Expand Down