libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 00:20:01 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(MSVC2003) Enable HAVE_OPENGL1; make HAVE_OPENGL1 independent from

Browse Source 
HAVE_OPENGL
This commit is contained in:
twinaphex 2019-04-22 22:48:23 +02:00
parent 3680c264d9
commit 04d062b3d4
10 changed files with 58 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/common/d3d8_common.h
View File

@ -199,13 +199,13 @@ static INLINE void d3d8_set_sampler_address_v(LPDIRECT3DDEVICE8 dev,
} }
static INLINE void d3d8_set_sampler_minfilter(void *_dev, static INLINE void d3d8_set_sampler_minfilter(void *_dev,
unsigned sampler, unsigned value) unsigned sampler, enum D3DTEXTUREFILTERTYPE value)
{ {
d3d8_set_texture_stage_state(_dev, sampler, D3DTSS_MINFILTER, value); d3d8_set_texture_stage_state(_dev, sampler, D3DTSS_MINFILTER, value);
} }
static INLINE void d3d8_set_sampler_magfilter(void *_dev, static INLINE void d3d8_set_sampler_magfilter(void *_dev,
unsigned sampler, unsigned value) unsigned sampler, enum D3DTEXTUREFILTERTYPE value)
{ {
d3d8_set_texture_stage_state(_dev, sampler, D3DTSS_MAGFILTER, value); d3d8_set_texture_stage_state(_dev, sampler, D3DTSS_MAGFILTER, value);
} }

2
gfx/common/win32_common.c
View File

@ -825,7 +825,7 @@ LRESULT CALLBACK WndProcD3D(HWND hwnd, UINT message,
} }
#endif #endif
#if defined(HAVE_OPENGL) || defined(HAVE_VULKAN) #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_VULKAN)
LRESULT CALLBACK WndProcGL(HWND hwnd, UINT message, LRESULT CALLBACK WndProcGL(HWND hwnd, UINT message,
WPARAM wparam, LPARAM lparam) WPARAM wparam, LPARAM lparam)
{ {

2
gfx/common/win32_common.h
View File

@ -127,7 +127,7 @@ LRESULT CALLBACK WndProcD3D(HWND hwnd, UINT message,
WPARAM wparam, LPARAM lparam); WPARAM wparam, LPARAM lparam);
#endif #endif
#if defined(HAVE_OPENGL) || defined(HAVE_VULKAN) #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_VULKAN)
LRESULT CALLBACK WndProcGL(HWND hwnd, UINT message, LRESULT CALLBACK WndProcGL(HWND hwnd, UINT message,
WPARAM wparam, LPARAM lparam); WPARAM wparam, LPARAM lparam);
#endif #endif

6
gfx/drivers/d3d8.c
View File

@ -429,13 +429,13 @@ static void d3d8_overlay_render(d3d8_video_t *d3d,
overlay_t *overlay, bool force_linear) overlay_t *overlay, bool force_linear)
{ {
D3DVIEWPORT8 vp_full; D3DVIEWPORT8 vp_full;
D3DTEXTUREFILTERTYPE filter_type;
struct video_viewport vp; struct video_viewport vp;
void *verts; void *verts;
unsigned i; unsigned i;
Vertex vert[4]; Vertex vert[4];
unsigned width = video_info->width; enum D3DTEXTUREFILTERTYPE filter_type = D3DTEXF_LINEAR;
unsigned height = video_info->height; unsigned width = video_info->width;
unsigned height = video_info->height;
if (!d3d || !overlay || !overlay->tex) if (!d3d || !overlay || !overlay->tex)
return; return;

28
gfx/drivers_context/wgl_ctx.c
View File

@ -47,15 +47,17 @@
#include "../common/win32_common.h" #include "../common/win32_common.h"
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL)
#include "../common/gl_common.h" #include "../common/gl_common.h"
#elif defined(HAVE_OPENGL1)
#include "../common/gl1_common.h"
#endif #endif
#ifdef HAVE_VULKAN #ifdef HAVE_VULKAN
#include "../common/vulkan_common.h" #include "../common/vulkan_common.h"
#endif #endif
#if defined(HAVE_OPENGL) || defined(HAVE_VULKAN) #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_VULKAN)
#ifndef WGL_CONTEXT_MAJOR_VERSION_ARB #ifndef WGL_CONTEXT_MAJOR_VERSION_ARB
#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 #define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091
#endif #endif
@ -81,7 +83,7 @@
#endif #endif
#endif #endif
#if defined(HAVE_OPENGL) #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
typedef HGLRC (APIENTRY *wglCreateContextAttribsProc)(HDC, HGLRC, const int*); typedef HGLRC (APIENTRY *wglCreateContextAttribsProc)(HDC, HGLRC, const int*);
static wglCreateContextAttribsProc pcreate_context; static wglCreateContextAttribsProc pcreate_context;
#endif #endif
@ -107,7 +109,7 @@ static enum gfx_ctx_api win32_api = GFX_CTX_NONE;
static dylib_t dll_handle = NULL; /* Handle to OpenGL32.dll */ static dylib_t dll_handle = NULL; /* Handle to OpenGL32.dll */
#endif #endif
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
static bool wgl_has_extension(const char *extension, const char *extensions) static bool wgl_has_extension(const char *extension, const char *extensions)
{ {
const char *start = NULL; const char *start = NULL;
@ -149,7 +151,7 @@ static gfx_ctx_proc_t gfx_ctx_wgl_get_proc_address(const char *symbol)
switch (win32_api) switch (win32_api)
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
#if defined(HAVE_OPENGL) #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
{ {
gfx_ctx_proc_t func = (gfx_ctx_proc_t)wglGetProcAddress(symbol); gfx_ctx_proc_t func = (gfx_ctx_proc_t)wglGetProcAddress(symbol);
if (func) if (func)
@ -168,7 +170,7 @@ static gfx_ctx_proc_t gfx_ctx_wgl_get_proc_address(const char *symbol)
#endif #endif
} }
#if defined(HAVE_OPENGL) #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
static void setup_pixel_format(HDC hdc) static void setup_pixel_format(HDC hdc)
{ {
PIXELFORMATDESCRIPTOR pfd = {0}; PIXELFORMATDESCRIPTOR pfd = {0};
@ -323,7 +325,7 @@ void create_graphics_context(HWND hwnd, bool *quit)
switch (win32_api) switch (win32_api)
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
#if defined(HAVE_OPENGL) #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
create_gl_context(hwnd, quit); create_gl_context(hwnd, quit);
#endif #endif
break; break;
@ -367,7 +369,7 @@ static void gfx_ctx_wgl_swap_interval(void *data, int interval)
switch (win32_api) switch (win32_api)
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
win32_interval = interval; win32_interval = interval;
if (!win32_hrc) if (!win32_hrc)
return; return;
@ -585,7 +587,7 @@ static void gfx_ctx_wgl_destroy(void *data)
switch (win32_api) switch (win32_api)
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
if (win32_hrc) if (win32_hrc)
{ {
glFinish(); glFinish();
@ -747,7 +749,7 @@ static bool gfx_ctx_wgl_bind_api(void *data,
win32_minor = minor; win32_minor = minor;
win32_api = api; win32_api = api;
#if defined(HAVE_OPENGL) #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
if (api == GFX_CTX_OPENGL_API) if (api == GFX_CTX_OPENGL_API)
return true; return true;
#endif #endif
@ -770,7 +772,7 @@ static void gfx_ctx_wgl_bind_hw_render(void *data, bool enable)
switch (win32_api) switch (win32_api)
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
win32_use_hw_ctx = enable; win32_use_hw_ctx = enable;
if (win32_hdc) if (win32_hdc)
@ -843,11 +845,9 @@ static void gfx_ctx_wgl_set_flags(void *data, uint32_t flags)
switch (win32_api) switch (win32_api)
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
if (BIT32_GET(flags, GFX_CTX_FLAGS_ADAPTIVE_VSYNC)) if (BIT32_GET(flags, GFX_CTX_FLAGS_ADAPTIVE_VSYNC))
{
wgl_adaptive_vsync = true; wgl_adaptive_vsync = true;
}
if (BIT32_GET(flags, GFX_CTX_FLAGS_GL_CORE_CONTEXT)) if (BIT32_GET(flags, GFX_CTX_FLAGS_GL_CORE_CONTEXT))
win32_core_hw_context_enable = true; win32_core_hw_context_enable = true;

38
gfx/drivers_context/x_ctx.c
View File

@ -23,7 +23,7 @@
#include "../../config.h" #include "../../config.h"
#endif #endif
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
#include <GL/glx.h> #include <GL/glx.h>
#ifndef GLX_SAMPLE_BUFFERS #ifndef GLX_SAMPLE_BUFFERS
@ -53,7 +53,7 @@
#include "../common/vulkan_common.h" #include "../common/vulkan_common.h"
#endif #endif
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
static int (*g_pglSwapInterval)(int); static int (*g_pglSwapInterval)(int);
static int (*g_pglSwapIntervalSGI)(int); static int (*g_pglSwapIntervalSGI)(int);
static void (*g_pglSwapIntervalEXT)(Display*, GLXDrawable, int); static void (*g_pglSwapIntervalEXT)(Display*, GLXDrawable, int);
@ -94,7 +94,7 @@ typedef struct gfx_ctx_x_data
bool g_is_double; bool g_is_double;
bool core_hw_context_enable; bool core_hw_context_enable;
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
GLXWindow g_glx_win; GLXWindow g_glx_win;
GLXContext g_ctx, g_hw_ctx; GLXContext g_ctx, g_hw_ctx;
GLXFBConfig g_fbc; GLXFBConfig g_fbc;
@ -147,7 +147,7 @@ static const unsigned long retroarch_icon_data[] = {
0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
}; };
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
static PFNGLXCREATECONTEXTATTRIBSARBPROC glx_create_context_attribs; static PFNGLXCREATECONTEXTATTRIBSARBPROC glx_create_context_attribs;
static int GLXExtensionSupported(Display *dpy, const char *extension) static int GLXExtensionSupported(Display *dpy, const char *extension)
@ -192,7 +192,7 @@ static void gfx_ctx_x_destroy_resources(gfx_ctx_x_data_t *x)
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
case GFX_CTX_OPENGL_ES_API: case GFX_CTX_OPENGL_ES_API:
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
if (x->g_ctx) if (x->g_ctx)
{ {
if (x->swap_mode) if (x->swap_mode)
@ -262,7 +262,7 @@ static void gfx_ctx_x_destroy_resources(gfx_ctx_x_data_t *x)
} }
} }
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
g_pglSwapInterval = NULL; g_pglSwapInterval = NULL;
g_pglSwapIntervalSGI = NULL; g_pglSwapIntervalSGI = NULL;
g_pglSwapIntervalEXT = NULL; g_pglSwapIntervalEXT = NULL;
@ -304,7 +304,7 @@ static void gfx_ctx_x_swap_interval(void *data, int interval)
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
case GFX_CTX_OPENGL_ES_API: case GFX_CTX_OPENGL_ES_API:
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
x->g_interval = interval; x->g_interval = interval;
if (g_pglSwapIntervalEXT) if (g_pglSwapIntervalEXT)
@ -352,7 +352,7 @@ static void gfx_ctx_x_swap_buffers(void *data, void *data2)
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
case GFX_CTX_OPENGL_ES_API: case GFX_CTX_OPENGL_ES_API:
#if defined(HAVE_OPENGL) #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
if (x->swap_mode) if (x->swap_mode)
{ {
if (x->g_interval) if (x->g_interval)
@ -456,7 +456,7 @@ static void *gfx_ctx_x_init(video_frame_info_t *video_info, void *data)
int nelements = 0; int nelements = 0;
int major = 0; int major = 0;
int minor = 0; int minor = 0;
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
static const int visual_attribs[] = { static const int visual_attribs[] = {
GLX_X_RENDERABLE , True, GLX_X_RENDERABLE , True,
GLX_DRAWABLE_TYPE , GLX_WINDOW_BIT, GLX_DRAWABLE_TYPE , GLX_WINDOW_BIT,
@ -495,7 +495,7 @@ static void *gfx_ctx_x_init(video_frame_info_t *video_info, void *data)
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
case GFX_CTX_OPENGL_ES_API: case GFX_CTX_OPENGL_ES_API:
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_OPENGLES)
glXQueryVersion(g_x11_dpy, &major, &minor); glXQueryVersion(g_x11_dpy, &major, &minor);
/* GLX 1.3+ minimum required. */ /* GLX 1.3+ minimum required. */
@ -555,7 +555,7 @@ static void *gfx_ctx_x_init(video_frame_info_t *video_info, void *data)
switch (x_api) switch (x_api)
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
if (GLXExtensionSupported(g_x11_dpy, "GLX_EXT_swap_control_tear")) if (GLXExtensionSupported(g_x11_dpy, "GLX_EXT_swap_control_tear"))
{ {
RARCH_LOG("[GLX]: GLX_EXT_swap_control_tear supported.\n"); RARCH_LOG("[GLX]: GLX_EXT_swap_control_tear supported.\n");
@ -633,7 +633,7 @@ static bool gfx_ctx_x_set_video_mode(void *data,
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
case GFX_CTX_OPENGL_ES_API: case GFX_CTX_OPENGL_ES_API:
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
vi = glXGetVisualFromFBConfig(g_x11_dpy, x->g_fbc); vi = glXGetVisualFromFBConfig(g_x11_dpy, x->g_fbc);
if (!vi) if (!vi)
goto error; goto error;
@ -756,7 +756,7 @@ static bool gfx_ctx_x_set_video_mode(void *data,
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
case GFX_CTX_OPENGL_ES_API: case GFX_CTX_OPENGL_ES_API:
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
x->g_glx_win = glXCreateWindow(g_x11_dpy, x->g_fbc, g_x11_win, 0); x->g_glx_win = glXCreateWindow(g_x11_dpy, x->g_fbc, g_x11_win, 0);
#endif #endif
break; break;
@ -810,7 +810,7 @@ static bool gfx_ctx_x_set_video_mode(void *data,
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
case GFX_CTX_OPENGL_ES_API: case GFX_CTX_OPENGL_ES_API:
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
if (!x->g_ctx) if (!x->g_ctx)
{ {
if (x->g_core_es || x->g_debug) if (x->g_core_es || x->g_debug)
@ -924,7 +924,7 @@ static bool gfx_ctx_x_set_video_mode(void *data,
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
case GFX_CTX_OPENGL_ES_API: case GFX_CTX_OPENGL_ES_API:
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
glXGetConfig(g_x11_dpy, vi, GLX_DOUBLEBUFFER, &val); glXGetConfig(g_x11_dpy, vi, GLX_DOUBLEBUFFER, &val);
x->g_is_double = val; x->g_is_double = val;
@ -1039,7 +1039,7 @@ static gfx_ctx_proc_t gfx_ctx_x_get_proc_address(const char *symbol)
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
case GFX_CTX_OPENGL_ES_API: case GFX_CTX_OPENGL_ES_API:
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
return glXGetProcAddress((const GLubyte*)symbol); return glXGetProcAddress((const GLubyte*)symbol);
#else #else
break; break;
@ -1069,7 +1069,7 @@ static bool gfx_ctx_x_bind_api(void *data, enum gfx_ctx_api api,
switch (api) switch (api)
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
return true; return true;
#else #else
break; break;
@ -1122,7 +1122,7 @@ static void gfx_ctx_x_bind_hw_render(void *data, bool enable)
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
case GFX_CTX_OPENGL_ES_API: case GFX_CTX_OPENGL_ES_API:
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
x->g_use_hw_ctx = enable; x->g_use_hw_ctx = enable;
if (!g_x11_dpy || !x->g_glx_win) if (!g_x11_dpy || !x->g_glx_win)
return; return;
@ -1230,7 +1230,7 @@ static void gfx_ctx_x_make_current(bool release)
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
case GFX_CTX_OPENGL_ES_API: case GFX_CTX_OPENGL_ES_API:
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1)
if (release) if (release)
glXMakeContextCurrent(g_x11_dpy, None, None, NULL); glXMakeContextCurrent(g_x11_dpy, None, None, NULL);
else else

2
gfx/font_driver.c
View File

@ -151,7 +151,7 @@ static bool d3d9_font_init_first(
} }
#endif #endif
#ifdef HAVE_OPENGL #if defined(HAVE_OPENGL)
static const font_renderer_t *gl_font_backends[] = { static const font_renderer_t *gl_font_backends[] = {
&gl_raster_font, &gl_raster_font,
#if defined(HAVE_LIBDBGFONT) #if defined(HAVE_LIBDBGFONT)

6
gfx/video_driver.c
View File

@ -381,14 +381,14 @@ static const gfx_ctx_driver_t *gfx_ctx_drivers[] = {
#if defined(HAVE_OPENDINGUX_FBDEV) #if defined(HAVE_OPENDINGUX_FBDEV)
&gfx_ctx_opendingux_fbdev, &gfx_ctx_opendingux_fbdev,
#endif #endif
#if defined(_WIN32) && (defined(HAVE_OPENGL) || defined(HAVE_VULKAN)) #if defined(_WIN32) && (defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_VULKAN))
&gfx_ctx_wgl, &gfx_ctx_wgl,
#endif #endif
#if defined(HAVE_WAYLAND) #if defined(HAVE_WAYLAND)
&gfx_ctx_wayland, &gfx_ctx_wayland,
#endif #endif
#if defined(HAVE_X11) && !defined(HAVE_OPENGLES) #if defined(HAVE_X11) && !defined(HAVE_OPENGLES)
#if defined(HAVE_OPENGL) || defined(HAVE_VULKAN) #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_VULKAN)
&gfx_ctx_x, &gfx_ctx_x,
#endif #endif
#endif #endif
@ -410,7 +410,7 @@ static const gfx_ctx_driver_t *gfx_ctx_drivers[] = {
#if defined(__APPLE__) && !defined(TARGET_IPHONE_SIMULATOR) && !defined(TARGET_OS_IPHONE) #if defined(__APPLE__) && !defined(TARGET_IPHONE_SIMULATOR) && !defined(TARGET_OS_IPHONE)
&gfx_ctx_cgl, &gfx_ctx_cgl,
#endif #endif
#if (defined(HAVE_SDL) || defined(HAVE_SDL2)) && defined(HAVE_OPENGL) #if (defined(HAVE_SDL) || defined(HAVE_SDL2)) && (defined(HAVE_OPENGL) || defined(HAVE_OPENGL1))
&gfx_ctx_sdl_gl, &gfx_ctx_sdl_gl,
#endif #endif
#ifdef HAVE_OSMESA #ifdef HAVE_OSMESA

17
griffin/griffin.c
View File

@ -209,7 +209,7 @@ VIDEO CONTEXT
#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__) #if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
#if defined(HAVE_OPENGL) || defined(HAVE_VULKAN) #if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_VULKAN)
#include "../gfx/drivers_context/wgl_ctx.c" #include "../gfx/drivers_context/wgl_ctx.c"
#endif #endif
@ -416,11 +416,12 @@ VIDEO DRIVER
#include "../gfx/display_servers/dispserv_null.c" #include "../gfx/display_servers/dispserv_null.c"
#ifdef HAVE_OPENGL
#include "../gfx/drivers/gl.c"
#ifdef HAVE_OPENGL1 #ifdef HAVE_OPENGL1
#include "../gfx/drivers/gl1.c" #include "../gfx/drivers/gl1.c"
#endif #endif
#ifdef HAVE_OPENGL
#include "../gfx/drivers/gl.c"
#ifdef HAVE_OPENGL_CORE #ifdef HAVE_OPENGL_CORE
#include "../gfx/drivers/gl_core.c" #include "../gfx/drivers/gl_core.c"
#endif #endif
@ -499,11 +500,12 @@ FONTS
#include "../gfx/drivers_font/ps_libdbgfont.c" #include "../gfx/drivers_font/ps_libdbgfont.c"
#endif #endif
#if defined(HAVE_OPENGL)
#include "../gfx/drivers_font/gl_raster_font.c"
#ifdef HAVE_OPENGL1 #ifdef HAVE_OPENGL1
#include "../gfx/drivers_font/gl1_raster_font.c" #include "../gfx/drivers_font/gl1_raster_font.c"
#endif #endif
#if defined(HAVE_OPENGL)
#include "../gfx/drivers_font/gl_raster_font.c"
#ifdef HAVE_OPENGL_CORE #ifdef HAVE_OPENGL_CORE
#include "../gfx/drivers_font/gl_core_raster_font.c" #include "../gfx/drivers_font/gl_core_raster_font.c"
#endif #endif
@ -1267,11 +1269,12 @@ MENU
#include "../menu/drivers_display/menu_display_d3d12.c" #include "../menu/drivers_display/menu_display_d3d12.c"
#endif #endif
#ifdef HAVE_OPENGL
#include "../menu/drivers_display/menu_display_gl.c"
#ifdef HAVE_OPENGL1 #ifdef HAVE_OPENGL1
#include "../menu/drivers_display/menu_display_gl1.c" #include "../menu/drivers_display/menu_display_gl1.c"
#endif #endif
#ifdef HAVE_OPENGL
#include "../menu/drivers_display/menu_display_gl.c"
#ifdef HAVE_OPENGL_CORE #ifdef HAVE_OPENGL_CORE
#include "../menu/drivers_display/menu_display_gl_core.c" #include "../menu/drivers_display/menu_display_gl_core.c"
#endif #endif

8
pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj
View File

@ -21,7 +21,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\libretro-common\include&quot;;&quot;$(SolutionDir)\..\..\libretro-common\include\compat\msvc&quot;;&quot;$(SolutionDir)\..\..\deps&quot;;&quot;$(SolutionDir)\..\..\deps\stb&quot;;&quot;$(SolutionDir)\..\..\deps\rcheevos\include&quot;;&quot;$(SolutionDir)\..\..\gfx\include&quot;" AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\libretro-common\include&quot;;&quot;$(SolutionDir)\..\..\libretro-common\include\compat\msvc&quot;;&quot;$(SolutionDir)\..\..\deps&quot;;&quot;$(SolutionDir)\..\..\deps\stb&quot;;&quot;$(SolutionDir)\..\..\deps\rcheevos\include&quot;;&quot;$(SolutionDir)\..\..\gfx\include&quot;"
PreprocessorDefinitions="_WIN32;WINVER=0x0400;_WIN32_WINNT=0x0400;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_CHEEVOS;RC_DISABLE_LUA;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;WANT_ZLIB;HAVE_DINPUT;HAVE_DSOUND;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETPLAYDISCOVERY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_OVERLAY;HAVE_RGUI;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_D3D;HAVE_D3D8;DEBUG;_DEBUG;__STDC_CONSTANT_MACROS" PreprocessorDefinitions="_WIN32;WINVER=0x0400;_WIN32_WINNT=0x0400;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_CHEEVOS;RC_DISABLE_LUA;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;WANT_ZLIB;HAVE_DINPUT;HAVE_DSOUND;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETPLAYDISCOVERY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_OVERLAY;HAVE_RGUI;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_D3D;HAVE_D3D8;HAVE_OPENGL1;DEBUG;_DEBUG;__STDC_CONSTANT_MACROS"
MinimalRebuild="TRUE" MinimalRebuild="TRUE"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="5" RuntimeLibrary="5"
@ -33,7 +33,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="winmm.lib" AdditionalDependencies="winmm.lib opengl32.lib"
OutputFile="$(OutDir)/RetroArch-msvc2003.exe" OutputFile="$(OutDir)/RetroArch-msvc2003.exe"
LinkIncremental="2" LinkIncremental="2"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
@ -70,7 +70,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\libretro-common\include&quot;;&quot;$(SolutionDir)\..\..\libretro-common\include\compat\msvc&quot;;&quot;$(SolutionDir)\..\..\deps&quot;;&quot;$(SolutionDir)\..\..\deps\stb&quot;;&quot;$(SolutionDir)\..\..\deps\rcheevos\include&quot;;&quot;$(SolutionDir)\..\..\gfx\include&quot;" AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\libretro-common\include&quot;;&quot;$(SolutionDir)\..\..\libretro-common\include\compat\msvc&quot;;&quot;$(SolutionDir)\..\..\deps&quot;;&quot;$(SolutionDir)\..\..\deps\stb&quot;;&quot;$(SolutionDir)\..\..\deps\rcheevos\include&quot;;&quot;$(SolutionDir)\..\..\gfx\include&quot;"
PreprocessorDefinitions="_WIN32;WINVER=0x0400;_WIN32_WINNT=0x0400;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_CHEEVOS;RC_DISABLE_LUA;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;WANT_ZLIB;HAVE_DINPUT;HAVE_DSOUND;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_OVERLAY;HAVE_RGUI;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_D3D;HAVE_D3D8;__STDC_CONSTANT_MACROS" PreprocessorDefinitions="_WIN32;WINVER=0x0400;_WIN32_WINNT=0x0400;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_CHEEVOS;RC_DISABLE_LUA;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;WANT_ZLIB;HAVE_DINPUT;HAVE_DSOUND;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_OVERLAY;HAVE_RGUI;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_D3D;HAVE_D3D8;HAVE_OPENGL1;__STDC_CONSTANT_MACROS"
RuntimeLibrary="4" RuntimeLibrary="4"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
@ -80,7 +80,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="winmm.lib" AdditionalDependencies="winmm.lib opengl32.lib"
OutputFile="$(OutDir)/RetroArch-msvc2003.exe" OutputFile="$(OutDir)/RetroArch-msvc2003.exe"
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"