mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make history.c no longer dependent on menu

Browse Source
This commit is contained in:
twinaphex 2014-07-25 20:56:31 +02:00
parent 42c48b715c
commit 9c96b3ada2
8 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -111,8 +111,10 @@ ifeq ($(HAVE_LAKKA), 1)
endif endif
endif endif
OBJ += history.o
ifeq ($(HAVE_MENU_COMMON), 1) ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += frontend/menu/backend/menu_common_backend.o frontend/menu/menu_input_line_cb.o frontend/menu/menu_common.o frontend/menu/menu_navigation.o frontend/menu/file_list.o frontend/menu/history.o OBJ += frontend/menu/backend/menu_common_backend.o frontend/menu/menu_input_line_cb.o frontend/menu/menu_common.o frontend/menu/menu_navigation.o frontend/menu/file_list.o
endif endif
ifeq ($(HAVE_THREADS), 1) ifeq ($(HAVE_THREADS), 1)

4
Makefile.emscripten
View File

@ -79,8 +79,10 @@ ifeq ($(HAVE_RGUI), 1)
HAVE_MENU_COMMON = 1 HAVE_MENU_COMMON = 1
endif endif
OBJ += history.o
ifeq ($(HAVE_MENU_COMMON), 1) ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += frontend/menu/backend/menu_common_backend.o frontend/menu/menu_input_line_cb.o frontend/menu/menu_common.o frontend/menu/menu_navigation.o frontend/menu/file_list.o frontend/menu/history.o OBJ += frontend/menu/backend/menu_common_backend.o frontend/menu/menu_input_line_cb.o frontend/menu/menu_common.o frontend/menu/menu_navigation.o frontend/menu/file_list.o
endif endif
ifeq ($(HAVE_SDL), 1) ifeq ($(HAVE_SDL), 1)

4
Makefile.win
View File

@ -125,8 +125,10 @@ ifeq ($(HAVE_LAKKA), 1)
endif endif
endif endif
OBJ += history.o
ifeq ($(HAVE_MENU_COMMON), 1) ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += frontend/menu/backend/menu_common_backend.o frontend/menu/menu_input_line_cb.o frontend/menu/menu_common.o frontend/menu/menu_navigation.o frontend/menu/file_list.o frontend/menu/history.o OBJ += frontend/menu/backend/menu_common_backend.o frontend/menu/menu_input_line_cb.o frontend/menu/menu_common.o frontend/menu/menu_navigation.o frontend/menu/file_list.o
endif endif
ifeq ($(HAVE_SDL), 1) ifeq ($(HAVE_SDL), 1)

2
general.h
View File

@ -35,7 +35,7 @@
#include "miscellaneous.h" #include "miscellaneous.h"
#include "gfx/filter.h" #include "gfx/filter.h"
#include "frontend/menu/history.h" #include "history.h"
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"

7
griffin/griffin.c
View File

@ -596,6 +596,12 @@ SCREENSHOTS
#include "../screenshot.c" #include "../screenshot.c"
#endif #endif
/*============================================================
HISTORY
============================================================ */
#include "../history.c"
/*============================================================ /*============================================================
MENU MENU
============================================================ */ ============================================================ */
@ -603,7 +609,6 @@ MENU
#include "../frontend/menu/menu_input_line_cb.c" #include "../frontend/menu/menu_input_line_cb.c"
#include "../frontend/menu/menu_common.c" #include "../frontend/menu/menu_common.c"
#include "../frontend/menu/menu_navigation.c" #include "../frontend/menu/menu_navigation.c"
#include "../frontend/menu/history.c"
#include "../frontend/menu/file_list.c" #include "../frontend/menu/file_list.c"
#ifdef HAVE_MENU #ifdef HAVE_MENU

10
frontend/menu/history.c → history.c
View File

@ -16,11 +16,11 @@
*/ */
#include "history.h" #include "history.h"
#include "../../msvc/msvc_compat.h" #include "msvc/msvc_compat.h"
#include "../../compat/posix_string.h" #include "compat/posix_string.h"
#include "../../boolean.h" #include "boolean.h"
#include "../../general.h" #include "general.h"
#include "../../file.h" #include "file.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

0
frontend/menu/history.h → history.h
View File

2
msvc/msvc-2010/RetroArch-msvc2010.vcxproj
View File

@ -217,7 +217,7 @@
<ClCompile Include="..\..\deps\rzlib\unzip.c" /> <ClCompile Include="..\..\deps\rzlib\unzip.c" />
<ClCompile Include="..\..\deps\rzlib\zutil.c" /> <ClCompile Include="..\..\deps\rzlib\zutil.c" />
<ClCompile Include="..\..\file_extract.c" /> <ClCompile Include="..\..\file_extract.c" />
<ClCompile Include="..\..\frontend\menu\history.c" /> <ClCompile Include="..\..\history.c" />
<ClCompile Include="..\..\frontend\menu\file_list.c" /> <ClCompile Include="..\..\frontend\menu\file_list.c" />
<ClCompile Include="..\..\frontend\menu\backend\menu_common_backend.c" /> <ClCompile Include="..\..\frontend\menu\backend\menu_common_backend.c" />
<ClCompile Include="..\..\frontend\menu\disp\rgui.c" /> <ClCompile Include="..\..\frontend\menu\disp\rgui.c" />