From 532d112ff81a0800e3576dc8d6e99ad8ed0c5aee Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 3 Apr 2015 20:36:19 +0200 Subject: [PATCH] (Font) Combine font_d3d_driver and font_gl_driver --- Makefile.common | 7 ++- config.def.h | 2 +- gfx/d3d/d3d.h | 2 +- gfx/d3d/d3d_defines.h | 6 +-- gfx/drivers/gl.c | 2 +- gfx/drivers_font/d3d_w32_font.c | 2 +- gfx/drivers_font/gl_raster_font.c | 2 +- gfx/drivers_font/ps_libdbgfont.c | 2 +- gfx/drivers_font/xdk1_xfonts.c | 2 +- gfx/drivers_font/xdk360_fonts.c | 2 +- gfx/{font_d3d_driver.c => font_driver.c} | 36 +++++++++++++++- gfx/{font_d3d_driver.h => font_driver.h} | 13 ++++-- gfx/font_gl_driver.c | 47 --------------------- gfx/font_gl_driver.h | 29 ------------- gfx/video_context_driver.c | 2 +- gfx/video_driver.c | 2 +- griffin/griffin.c | 15 ++----- menu/drivers/glui.c | 2 +- menu/drivers/xmb.c | 2 +- msvc/RetroArch-360/RetroArch-360.vcxproj | 12 +++--- msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj | 14 +++--- msvc/msvc-2010/RetroArch-msvc2010.vcxproj | 8 ++-- 22 files changed, 84 insertions(+), 127 deletions(-) rename gfx/{font_d3d_driver.c => font_driver.c} (68%) rename gfx/{font_d3d_driver.h => font_driver.h} (81%) delete mode 100644 gfx/font_gl_driver.c delete mode 100644 gfx/font_gl_driver.h diff --git a/Makefile.common b/Makefile.common index 27591e91c7..92ec2ee118 100644 --- a/Makefile.common +++ b/Makefile.common @@ -1,5 +1,5 @@ HAVE_LIBRETRODB = 1 -#HAVE_LIBUSB = 1 +HAVE_LIBUSB = 1 ifeq ($(HAVE_LIBRETRODB), 1) DEFINES += -DHAVE_LIBRETRODB @@ -153,6 +153,7 @@ OBJ += frontend/frontend.o \ libretro-common/gfx/scaler/pixconv.o \ libretro-common/gfx/scaler/scaler_int.o \ libretro-common/gfx/scaler/scaler_filter.o \ + gfx/font_driver.o \ gfx/font_renderer_driver.o \ gfx/video_filter.o \ audio/audio_resampler_driver.o \ @@ -421,7 +422,6 @@ ifeq ($(HAVE_OPENGL), 1) gfx/gl_common.o \ gfx/video_context_driver.o \ gfx/drivers_context/gfx_null_ctx.o \ - gfx/font_gl_driver.o \ gfx/drivers_font/gl_raster_font.o \ libretro-common/gfx/math/matrix_4x4.o \ gfx/video_state_tracker.o \ @@ -567,10 +567,9 @@ ifeq ($(HAVE_D3D9), 1) OBJ += gfx/d3d/d3d.o \ gfx/d3d/render_chain.o \ gfx/d3d/d3d_wrapper.o \ - gfx/font_d3d_driver.o \ gfx/drivers_font/d3d_w32_font.o \ gfx/drivers_context/d3d_ctx.o - DEFINES += -DHAVE_WIN32_D3D9 + DEFINES += -DHAVE_D3D -DHAVE_D3D9 LIBS += -ld3d9 -ld3dx9 -ldxguid ifeq ($(HAVE_CG), 1) diff --git a/config.def.h b/config.def.h index 4f25d2cf75..a6a80d9649 100644 --- a/config.def.h +++ b/config.def.h @@ -138,7 +138,7 @@ enum #define VIDEO_DEFAULT_DRIVER VIDEO_XENON360 #elif (defined(_XBOX1) || defined(_XBOX360)) && (defined(HAVE_D3D8) || defined(HAVE_D3D9)) #define VIDEO_DEFAULT_DRIVER VIDEO_XDK_D3D -#elif defined(HAVE_WIN32_D3D9) +#elif defined(HAVE_D3D9) #define VIDEO_DEFAULT_DRIVER VIDEO_D3D9 #elif defined(HAVE_VG) #define VIDEO_DEFAULT_DRIVER VIDEO_VG diff --git a/gfx/d3d/d3d.h b/gfx/d3d/d3d.h index 0bd2053f2e..0dda1c0634 100644 --- a/gfx/d3d/d3d.h +++ b/gfx/d3d/d3d.h @@ -49,7 +49,7 @@ #include "../video_shader_driver.h" #endif -#include "../font_d3d_driver.h" +#include "../font_driver.h" #include "../video_context_driver.h" #ifdef HAVE_CG diff --git a/gfx/d3d/d3d_defines.h b/gfx/d3d/d3d_defines.h index df2930d885..92de06ca90 100644 --- a/gfx/d3d/d3d_defines.h +++ b/gfx/d3d/d3d_defines.h @@ -17,8 +17,8 @@ #ifndef D3DVIDEO_DEFINES_H #define D3DVIDEO_DEFINES_H -#if defined(HAVE_WIN32_D3D9) || defined(_XBOX360) -//Direct3D 9 +#if defined(HAVE_D3D9) +/* Direct3D 9 */ #include #include #include @@ -46,7 +46,7 @@ #elif defined(_XBOX1) #include -//Direct3D 8 +/* Direct3D 8 */ #define LPDIRECT3D LPDIRECT3D8 #define LPDIRECT3DDEVICE LPDIRECT3DDEVICE8 #define LPDIRECT3DTEXTURE LPDIRECT3DTEXTURE8 diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index 25dd43f710..23611dd89d 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -39,7 +39,7 @@ #endif #include "../gl_common.h" -#include "../font_gl_driver.h" +#include "../font_driver.h" #include "../video_viewport.h" #include "../video_pixel_converter.h" #include "../video_context_driver.h" diff --git a/gfx/drivers_font/d3d_w32_font.c b/gfx/drivers_font/d3d_w32_font.c index 5b854a79cd..6467a70ac9 100644 --- a/gfx/drivers_font/d3d_w32_font.c +++ b/gfx/drivers_font/d3d_w32_font.c @@ -15,7 +15,7 @@ */ #include "../d3d/d3d.h" -#include "../font_d3d_driver.h" +#include "../font_driver.h" #include "../../general.h" typedef struct diff --git a/gfx/drivers_font/gl_raster_font.c b/gfx/drivers_font/gl_raster_font.c index e83cd0f0b6..65b2813072 100644 --- a/gfx/drivers_font/gl_raster_font.c +++ b/gfx/drivers_font/gl_raster_font.c @@ -15,7 +15,7 @@ */ #include "../gl_common.h" -#include "../font_gl_driver.h" +#include "../font_driver.h" #include "../video_shader_driver.h" /* TODO: Move viewport side effects to the caller: it's a source of bugs. */ diff --git a/gfx/drivers_font/ps_libdbgfont.c b/gfx/drivers_font/ps_libdbgfont.c index 85e5b86056..28abc47d59 100644 --- a/gfx/drivers_font/ps_libdbgfont.c +++ b/gfx/drivers_font/ps_libdbgfont.c @@ -16,7 +16,7 @@ #include "../font_renderer_driver.h" #include "../gl_common.h" -#include "../font_gl_driver.h" +#include "../font_driver.h" #if defined(SN_TARGET_PSP2) #include diff --git a/gfx/drivers_font/xdk1_xfonts.c b/gfx/drivers_font/xdk1_xfonts.c index 9af1f1f4df..aab5f774f8 100644 --- a/gfx/drivers_font/xdk1_xfonts.c +++ b/gfx/drivers_font/xdk1_xfonts.c @@ -15,7 +15,7 @@ */ #include -#include "../font_d3d_driver.h" +#include "../font_driver.h" #include "../../general.h" typedef struct diff --git a/gfx/drivers_font/xdk360_fonts.c b/gfx/drivers_font/xdk360_fonts.c index b8b3a5a828..76a83e3e16 100644 --- a/gfx/drivers_font/xdk360_fonts.c +++ b/gfx/drivers_font/xdk360_fonts.c @@ -15,7 +15,7 @@ */ #include -#include "../font_d3d_driver.h" +#include "../font_driver.h" #include "../d3d/d3d.h" #include "../../general.h" #include "../../xdk/xdk_resources.h" diff --git a/gfx/font_d3d_driver.c b/gfx/font_driver.c similarity index 68% rename from gfx/font_d3d_driver.c rename to gfx/font_driver.c index f39791f446..fb658ef4a4 100644 --- a/gfx/font_d3d_driver.c +++ b/gfx/font_driver.c @@ -14,9 +14,11 @@ * If not, see . */ -#include "font_d3d_driver.h" +#include "font_driver.h" +#include "font_renderer_driver.h" #include "../general.h" +#ifdef HAVE_D3D static const font_renderer_t *d3d_font_backends[] = { #if defined(_XBOX1) &d3d_xdk1_font, @@ -48,3 +50,35 @@ bool d3d_font_init_first( return false; } +#endif + +#ifdef HAVE_OPENGL +static const font_renderer_t *gl_font_backends[] = { +#if defined(HAVE_LIBDBGFONT) + &libdbg_font, +#else + &gl_raster_font, +#endif + NULL, +}; + +bool gl_font_init_first(const void **font_driver, void **font_handle, + void *video_data, const char *font_path, float font_size) +{ + unsigned i; + + for (i = 0; gl_font_backends[i]; i++) + { + void *data = gl_font_backends[i]->init(video_data, font_path, font_size); + + if (!data) + continue; + + *font_driver = gl_font_backends[i]; + *font_handle = data; + return true; + } + + return false; +} +#endif diff --git a/gfx/font_d3d_driver.h b/gfx/font_driver.h similarity index 81% rename from gfx/font_d3d_driver.h rename to gfx/font_driver.h index 4e03df8cbd..5e02697293 100644 --- a/gfx/font_d3d_driver.h +++ b/gfx/font_driver.h @@ -14,21 +14,28 @@ * If not, see . */ -#ifndef __FONT_D3D_DRIVER_H__ -#define __FONT_D3D_DRIVER_H__ +#ifndef __FONT_DRIVER_H__ +#define __FONT_DRIVER_H__ #include #include #include "../driver.h" -#include "font_renderer_driver.h" #ifdef __cplusplus extern "C" { #endif +#ifdef HAVE_D3D bool d3d_font_init_first( const void **font_driver, void **font_handle, void *video_data, const char *font_path, float font_size); +#endif + +#ifdef HAVE_OPENGL +bool gl_font_init_first(const void **font_driver, + void **font_handle, void *gl_data, + const char *font_path, float font_size); +#endif #ifdef __cplusplus } diff --git a/gfx/font_gl_driver.c b/gfx/font_gl_driver.c deleted file mode 100644 index b6919ceca3..0000000000 --- a/gfx/font_gl_driver.c +++ /dev/null @@ -1,47 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2015 - Daniel De Matteis - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#include "font_gl_driver.h" -#include "../general.h" - -static const font_renderer_t *gl_font_backends[] = { -#if defined(HAVE_LIBDBGFONT) - &libdbg_font, -#else - &gl_raster_font, -#endif - NULL, -}; - -bool gl_font_init_first(const void **font_driver, void **font_handle, - void *video_data, const char *font_path, float font_size) -{ - unsigned i; - - for (i = 0; gl_font_backends[i]; i++) - { - void *data = gl_font_backends[i]->init(video_data, font_path, font_size); - - if (!data) - continue; - - *font_driver = gl_font_backends[i]; - *font_handle = data; - return true; - } - - return false; -} diff --git a/gfx/font_gl_driver.h b/gfx/font_gl_driver.h deleted file mode 100644 index 21c4f3c7a3..0000000000 --- a/gfx/font_gl_driver.h +++ /dev/null @@ -1,29 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2015 - Daniel De Matteis - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#ifndef __FONT_GL_DRIVER_H__ -#define __FONT_GL_DRIVER_H__ - -#include "../driver.h" -#include "font_renderer_driver.h" -#include "gl_common.h" -#include - -bool gl_font_init_first(const void **font_driver, - void **font_handle, void *gl_data, - const char *font_path, float font_size); - -#endif diff --git a/gfx/video_context_driver.c b/gfx/video_context_driver.c index d519f72ab7..2e646a409a 100644 --- a/gfx/video_context_driver.c +++ b/gfx/video_context_driver.c @@ -26,7 +26,7 @@ static const gfx_ctx_driver_t *gfx_ctx_drivers[] = { #if defined(__CELLOS_LV2__) &gfx_ctx_ps3, #endif -#if defined(HAVE_WIN32_D3D9) || defined(_XBOX) +#if defined(HAVE_D3D) &gfx_ctx_d3d, #endif #if defined(HAVE_VIDEOCORE) diff --git a/gfx/video_driver.c b/gfx/video_driver.c index 0da3ed4da5..11f3181e4e 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -31,7 +31,7 @@ static const video_driver_t *video_drivers[] = { #ifdef XENON &video_xenon360, #endif -#if defined(_XBOX) && (defined(HAVE_D3D8) || defined(HAVE_D3D9)) || defined(HAVE_WIN32_D3D9) +#if defined(HAVE_D3D) &video_d3d, #endif #ifdef SN_TARGET_PSP2 diff --git a/griffin/griffin.c b/griffin/griffin.c index 083cc421d6..61d769df0a 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -100,7 +100,7 @@ VIDEO CONTEXT #if defined(__CELLOS_LV2__) #include "../gfx/drivers_context/ps3_ctx.c" -#elif defined(_XBOX) || defined(HAVE_WIN32_D3D9) +#elif defined(HAVE_D3D) #include "../gfx/drivers_context/d3d_ctx.c" #elif defined(ANDROID) #include "../gfx/drivers_context/androidegl_ctx.c" @@ -223,7 +223,7 @@ VIDEO DRIVER #include "../gfx/drivers/xvideo.c" #endif -#if defined(_XBOX) || defined(HAVE_WIN32_D3D9) +#if defined(HAVE_D3D) #include "../gfx/d3d/d3d_wrapper.c" #include "../gfx/d3d/d3d.cpp" #ifndef _XBOX @@ -248,6 +248,7 @@ FONTS #include "../gfx/font_renderer_driver.c" #include "../gfx/drivers_font_renderer/bitmapfont.c" +#include "../gfx/font_driver.c" #if defined(HAVE_FREETYPE) #include "../gfx/drivers_font_renderer/freetype.c" @@ -257,15 +258,7 @@ FONTS #include "../gfx/drivers_font_renderer/coretext.c" #endif -#ifdef HAVE_OPENGL -#include "../gfx/font_gl_driver.c" -#endif - -#if defined(_XBOX) || defined(HAVE_WIN32_D3D9) -#include "../gfx/font_d3d_driver.c" -#endif - -#if defined(HAVE_WIN32_D3D9) +#if defined(HAVE_D3D9) #include "../gfx/drivers_font/d3d_w32_font.c" #endif diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c index 3e8c0c6275..92525fcb46 100644 --- a/menu/drivers/glui.c +++ b/menu/drivers/glui.c @@ -25,7 +25,7 @@ #include #include "../../gfx/gl_common.h" -#include "../../gfx/font_gl_driver.h" +#include "../../gfx/font_driver.h" #include "../../gfx/video_texture.h" #include diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index a2a85d3b54..b2006dcc77 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -26,7 +26,7 @@ #include #include "../../gfx/video_thread_wrapper.h" #include "../../gfx/gl_common.h" -#include "../../gfx/font_gl_driver.h" +#include "../../gfx/font_driver.h" #include "../../gfx/video_texture.h" #include #include diff --git a/msvc/RetroArch-360/RetroArch-360.vcxproj b/msvc/RetroArch-360/RetroArch-360.vcxproj index b9da347b1a..02c94a4099 100644 --- a/msvc/RetroArch-360/RetroArch-360.vcxproj +++ b/msvc/RetroArch-360/RetroArch-360.vcxproj @@ -113,7 +113,7 @@ true false MultiThreadedDebug - _DEBUG;_XBOX;HAVE_XINPUT2;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN + _DEBUG;_XBOX;HAVE_XINPUT2;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN Callcap $(SolutionDir)\..\deps\zlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) @@ -152,7 +152,7 @@ AnalyzeOnly false MultiThreadedDebug - _DEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN + _DEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN Callcap $(SolutionDir)\..\deps\zlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) @@ -192,7 +192,7 @@ Size false MultiThreaded - NDEBUG;_XBOX;PROFILE;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN + NDEBUG;_XBOX;PROFILE;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN Callcap $(SolutionDir)\..\deps\zlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) @@ -237,7 +237,7 @@ Size false MultiThreaded - NDEBUG;_XBOX;PROFILE;FASTCAP;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_RMENU_XUI;HAVE_MENU;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN + NDEBUG;_XBOX;PROFILE;FASTCAP;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_RMENU_XUI;HAVE_MENU;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN $(SolutionDir)\..\deps\zlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) @@ -279,7 +279,7 @@ false false MultiThreaded - NDEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE=1;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_RMENU_XUI;HAVE_MENU;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN + NDEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE=1;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_RMENU_XUI;HAVE_MENU;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN $(SolutionDir)\..\deps\zlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) @@ -321,7 +321,7 @@ false false MultiThreaded - NDEBUG;_XBOX;LTCG;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN + NDEBUG;_XBOX;LTCG;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;HAVE_D3D;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN $(SolutionDir)\..\deps\zlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) diff --git a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj index 40b459401e..7f6a612827 100644 --- a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj +++ b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj @@ -22,7 +22,7 @@ Optimization="3" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\deps\zlib"" - PreprocessorDefinitions="_DEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;HAVE_GRIFFIN;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN;HAVE_BUILTIN_AUTOCONFIG" + PreprocessorDefinitions="_DEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;HAVE_GRIFFIN;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN;HAVE_BUILTIN_AUTOCONFIG" MinimalRebuild="TRUE" BasicRuntimeChecks="0" RuntimeLibrary="1" @@ -72,7 +72,7 @@ OmitFramePointers="TRUE" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\deps\zlib"" - PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;PROFILE;HAVE_GRIFFIN;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN;HAVE_BUILTIN_AUTOCONFIG" + PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;PROFILE;HAVE_GRIFFIN;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN;HAVE_BUILTIN_AUTOCONFIG" StringPooling="TRUE" RuntimeLibrary="0" BufferSecurityCheck="TRUE" @@ -127,7 +127,7 @@ OmitFramePointers="TRUE" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\deps\zlib"" - PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;PROFILE;FASTCAP;HAVE_GRIFFIN;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN;HAVE_BUILTIN_AUTOCONFIG" + PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;PROFILE;FASTCAP;HAVE_GRIFFIN;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN;HAVE_BUILTIN_AUTOCONFIG" StringPooling="TRUE" RuntimeLibrary="0" BufferSecurityCheck="TRUE" @@ -188,7 +188,7 @@ EnableFiberSafeOptimizations="TRUE" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\deps\zlib"" - PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;HAVE_GRIFFIN;inline=_inline;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN;HAVE_BUILTIN_AUTOCONFIG" + PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;HAVE_GRIFFIN;inline=_inline;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN;HAVE_BUILTIN_AUTOCONFIG" StringPooling="TRUE" RuntimeLibrary="0" BufferSecurityCheck="TRUE" @@ -241,7 +241,7 @@ OmitFramePointers="TRUE" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\deps\zlib"" - PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;LTCG;HAVE_GRIFFIN;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN;HAVE_BUILTIN_AUTOCONFIG" + PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;LTCG;HAVE_GRIFFIN;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN;HAVE_BUILTIN_AUTOCONFIG" StringPooling="TRUE" RuntimeLibrary="0" BufferSecurityCheck="TRUE" @@ -300,7 +300,7 @@ EnableFiberSafeOptimizations="TRUE" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\deps\zlib"" - PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;HAVE_GRIFFIN;inline=_inline;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN;HAVE_BUILTIN_AUTOCONFIG" + PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;HAVE_GRIFFIN;inline=_inline;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN;HAVE_BUILTIN_AUTOCONFIG" StringPooling="TRUE" RuntimeLibrary="0" BufferSecurityCheck="TRUE" @@ -353,7 +353,7 @@ OmitFramePointers="TRUE" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-stdint";"$(SolutionDir)\msvc-71";"$(SolutionDir)\..\deps\zlib"" - PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;LTCG;HAVE_GRIFFIN;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN;HAVE_BUILTIN_AUTOCONFIG" + PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;HAVE_RMENU;HAVE_MENU;RARCH_CONSOLE;HAVE_XINPUT_XBOX1;__STDC_CONSTANT_MACROS;HAVE_ZLIB;LTCG;HAVE_GRIFFIN;HAVE_LIBRETRO_MANAGEMENT;HAVE_RARCH_EXEC;HAVE_DSOUND;HAVE_D3D;HAVE_D3D8;RARCH_INTERNAL;WANT_ZLIB;SINC_LOWER_QUALITY;HAVE_THREADS;HAVE_FILTERS_BUILTIN;HAVE_BUILTIN_AUTOCONFIG" StringPooling="TRUE" RuntimeLibrary="0" BufferSecurityCheck="TRUE" diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj index 038ae6c120..72546860e8 100644 --- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj +++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj @@ -100,7 +100,7 @@ Level3 Disabled - WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_ZLIB;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_GLUI;HAVE_LIBRETRODB + WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_ZLIB;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_GLUI;HAVE_LIBRETRODB $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\gfx\inc;%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp @@ -120,7 +120,7 @@ Level3 Disabled - WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_ZLIB;HAVE_FBO;HAVE_ZLIB;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_GLUI;HAVE_LIBRETRODB + WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_ZLIB;HAVE_FBO;HAVE_ZLIB;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_GLUI;HAVE_LIBRETRODB $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\gfx\inc;%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp @@ -142,7 +142,7 @@ MaxSpeed true true - WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_ZLIB;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_GLUI;HAVE_LIBRETRODB + WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_ZLIB;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_GLUI;HAVE_LIBRETRODB $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\gfx\inc;%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp @@ -167,7 +167,7 @@ MaxSpeed true true - WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_ZLIB;HAVE_FBO;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_ZLIB;WANT_ZLIB;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_GLUI;HAVE_LIBRETRODB + WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_ZLIB;HAVE_FBO;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_ZLIB;WANT_ZLIB;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_GLUI;HAVE_LIBRETRODB $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\gfx\inc;%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp