Skip to content

engine, gameui: use system jpeglib headers on Linux #494

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

Open
Opvolger wants to merge 1 commit into
base: master
Choose a base branch
from
Open

engine, gameui: use system jpeglib headers on Linux #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions engine/sys_getmodes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,14 @@ typedef void *HDC;
#include "materialsystem/materialsystem_config.h"
#include "materialsystem/itexture.h"
#include "materialsystem/imaterialsystemhardwareconfig.h"
#if defined(_WIN32) || defined(ANDROID)
#include "jpeglib/jpeglib.h"
#else
// Use the system libjpeg headers: we link against the system libjpeg(-turbo), whose ABI
// (JPEG_LIB_VERSION 62) differs from the bundled v8 headers in public/jpeglib.
#include <stdio.h>
#include <jpeglib.h>
#endif
#include "vgui/ISurface.h"
#include "vgui_controls/Controls.h"
#include "gl_shader.h"
Expand Down
6 changes: 6 additions & 0 deletions gameui/OptionsSubMultiplayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,13 @@

// use the JPEGLIB_USE_STDIO define so that we can read in jpeg's from outside the game directory tree. For Spray Import.
#define JPEGLIB_USE_STDIO
#if defined(_WIN32) || defined(ANDROID)
#include "jpeglib/jpeglib.h"
#else
// System libjpeg headers, matching the linked system libjpeg(-turbo) (see engine/sys_getmodes.cpp).
#include <stdio.h>
#include <jpeglib.h>
#endif
#undef JPEGLIB_USE_STDIO

#include <setjmp.h>
Expand Down