diff --git a/Makefile.ps3 b/Makefile.ps3 index 051f86e412..7e7cf3001c 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -68,7 +68,7 @@ endif PPU_LDLIBS = -ldbgfont $(GL_LIBS) -lretro -lcgc -lgcm_cmd -lgcm_sys_stub -lresc_stub -lm -lio_stub -lfs_stub -lsysutil_stub -lsysutil_game_stub -lsysutil_screenshot_stub -lsysutil_np_stub -lpngdec_stub -ljpgdec_stub -lsysmodule_stub -laudio_stub -lnet_stub -lnetctl_stub -lpthread -DEFINES += -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_CG -DHAVE_FILEBROWSER -DHAVE_FBO -DHAVE_RARCH_MAIN_WRAP -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RGL -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -D__CELLOS_LV2__ -DHAVE_CONFIGFILE=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) +DEFINES += -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_LIBDBGFONTS -DHAVE_CG -DHAVE_FILEBROWSER -DHAVE_FBO -DHAVE_RARCH_MAIN_WRAP -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RGL -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -D__CELLOS_LV2__ -DHAVE_CONFIGFILE=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) ifeq ($(DEBUG), 1) PPU_OPTIMIZE_LV := -O0 -g diff --git a/ps3/ps3_video_psgl.c b/ps3/ps3_video_psgl.c index a911d2fb8a..50e8c1209c 100644 --- a/ps3/ps3_video_psgl.c +++ b/ps3/ps3_video_psgl.c @@ -656,7 +656,7 @@ static void ps3graphics_set_orientation(void * data, uint32_t orientation) glVertexPointer(2, GL_FLOAT, 0, vertex_ptr); } -#ifdef HAVE_LIBDBGFONT +#ifdef HAVE_LIBDBGFONTS static void gl_render_msg(gl_t *gl, const char *msg) { cellDbgFontPrintf(g_settings.video.msg_pos_x, g_settings.video.msg_pos_y, 1.11f, BLUE, msg); @@ -877,7 +877,9 @@ static bool gl_frame(void *data, const void *frame, unsigned width, unsigned hei static void psgl_deinit(gl_t *gl) { +#ifdef HAVE_LIBDBGFONTS cellDbgFontExit(); +#endif psglDestroyContext(gl->gl_context); psglDestroyDevice(gl->gl_device); @@ -979,6 +981,7 @@ static bool psgl_init_device(gl_t *gl, const video_info_t *video, uint32_t resol return true; } +#ifdef HAVE_LIBDBGFONTS static void psgl_init_dbgfont(gl_t *gl) { CellDbgFontConfig cfg; @@ -988,6 +991,7 @@ static void psgl_init_dbgfont(gl_t *gl) cfg.screenHeight = gl->win_height; cellDbgFontInit(&cfg); } +#endif static void *gl_init(const video_info_t *video, const input_driver_t **input, void **input_data) { @@ -1010,8 +1014,10 @@ static void *gl_init(const video_info_t *video, const input_driver_t **input, vo RARCH_LOG("GL: Using resolution %ux%u.\n", gl->win_width, gl->win_height); +#ifdef HAVE_LIBDBGFONTS RARCH_LOG("GL: Initializing debug fonts...\n"); psgl_init_dbgfont(gl); +#endif RARCH_LOG("Initializing menu shader...\n"); gl_cg_set_menu_shader(DEFAULT_MENU_SHADER_FILE);