libretro/gambatte-libretro
1
0
Fork 0
mirror of https://github.com/libretro/gambatte-libretro.git synced 2024-11-23 07:49:48 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

(Android) Add JNI Makefiles - had to rename array.h and memory.h

Browse Source 
to avoid system header include conflicts
This commit is contained in:
twinaphex 2012-10-16 22:05:34 +02:00
parent aa13231713
commit 61a4c5ace2
26 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
common/array.h → common/gambatte-array.h
View File

2
common/resample/src/blackmansinc.h
View File

@ -23,7 +23,7 @@
#include "subresampler.h" #include "subresampler.h"
#include "makesinckernel.h" #include "makesinckernel.h"
#include "cic4.h" #include "cic4.h"
#include "array.h" #include "gambatte-array.h"
#include <cmath> #include <cmath>
#include <cstdlib> #include <cstdlib>

2
common/resample/src/chainresampler.h
View File

@ -24,7 +24,7 @@
#include <cassert> #include <cassert>
#include <cstddef> #include <cstddef>
#include <list> #include <list>
#include "array.h" #include "gambatte-array.h"
#include "subresampler.h" #include "subresampler.h"
#include "../resampler.h" #include "../resampler.h"
#include "upsampler.h" #include "upsampler.h"

2
common/resample/src/convoluter.h
View File

@ -21,7 +21,7 @@
#include <algorithm> #include <algorithm>
#include <cstring> #include <cstring>
#include "array.h" #include "gambatte-array.h"
#include "rshift16_round.h" #include "rshift16_round.h"
template<unsigned channels, unsigned phases> template<unsigned channels, unsigned phases>

2
common/resample/src/hammingsinc.h
View File

@ -23,7 +23,7 @@
#include "subresampler.h" #include "subresampler.h"
#include "makesinckernel.h" #include "makesinckernel.h"
#include "cic3.h" #include "cic3.h"
#include "array.h" #include "gambatte-array.h"
#include <cmath> #include <cmath>
#include <cstdlib> #include <cstdlib>

2
common/resample/src/kaiser50sinc.h
View File

@ -24,7 +24,7 @@
#include "makesinckernel.h" #include "makesinckernel.h"
#include "i0.h" #include "i0.h"
#include "cic3.h" #include "cic3.h"
#include "array.h" #include "gambatte-array.h"
#include <cmath> #include <cmath>
#include <cstdlib> #include <cstdlib>

2
common/resample/src/kaiser70sinc.h
View File

@ -24,7 +24,7 @@
#include "makesinckernel.h" #include "makesinckernel.h"
#include "i0.h" #include "i0.h"
#include "cic4.h" #include "cic4.h"
#include "array.h" #include "gambatte-array.h"
#include <cmath> #include <cmath>
#include <cstdlib> #include <cstdlib>

2
common/resample/src/makesinckernel.cpp
View File

@ -17,7 +17,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include "makesinckernel.h" #include "makesinckernel.h"
#include "array.h" #include "gambatte-array.h"
void makeSincKernel(short *const kernel, const unsigned phases, const unsigned phaseLen, double fc, double (*win)(const long m, const long M)) { void makeSincKernel(short *const kernel, const unsigned phases, const unsigned phaseLen, double fc, double (*win)(const long m, const long M)) {
static const double PI = 3.14159265358979323846; static const double PI = 3.14159265358979323846;

2
common/resample/src/rectsinc.h
View File

@ -23,7 +23,7 @@
#include "subresampler.h" #include "subresampler.h"
#include "makesinckernel.h" #include "makesinckernel.h"
#include "cic2.h" #include "cic2.h"
#include "array.h" #include "gambatte-array.h"
#include <cmath> #include <cmath>
#include <cstdlib> #include <cstdlib>

2
common/ringbuffer.h
View File

@ -19,7 +19,7 @@
#ifndef RINGBUFFER_H #ifndef RINGBUFFER_H
#define RINGBUFFER_H #define RINGBUFFER_H
#include "array.h" #include "gambatte-array.h"
#include <cstddef> #include <cstddef>
#include <algorithm> #include <algorithm>
#include <cstring> #include <cstring>

2
common/videolink/rgb32conv.cpp
View File

@ -18,7 +18,7 @@
***************************************************************************/ ***************************************************************************/
#include "rgb32conv.h" #include "rgb32conv.h"
#include "videolink.h" #include "videolink.h"
#include "array.h" #include "gambatte-array.h"
#include "gbint.h" #include "gbint.h"
#include <algorithm> #include <algorithm>

2
common/videolink/vfilters/catrom2x.h
View File

@ -21,7 +21,7 @@
#include "../videolink.h" #include "../videolink.h"
#include "../vfilterinfo.h" #include "../vfilterinfo.h"
#include "array.h" #include "gambatte-array.h"
#include "gbint.h" #include "gbint.h"
class Catrom2x : public VideoLink { class Catrom2x : public VideoLink {

2
common/videolink/vfilters/catrom3x.h
View File

@ -21,7 +21,7 @@
#include "../videolink.h" #include "../videolink.h"
#include "../vfilterinfo.h" #include "../vfilterinfo.h"
#include "array.h" #include "gambatte-array.h"
#include "gbint.h" #include "gbint.h"
class Catrom3x : public VideoLink { class Catrom3x : public VideoLink {

2
common/videolink/vfilters/kreed2xsai.h
View File

@ -21,7 +21,7 @@
#include "../videolink.h" #include "../videolink.h"
#include "../vfilterinfo.h" #include "../vfilterinfo.h"
#include "array.h" #include "gambatte-array.h"
#include "gbint.h" #include "gbint.h"
class Kreed2xSaI : public VideoLink { class Kreed2xSaI : public VideoLink {

2
common/videolink/vfilters/maxsthq2x.h
View File

@ -21,7 +21,7 @@
#include "../videolink.h" #include "../videolink.h"
#include "../vfilterinfo.h" #include "../vfilterinfo.h"
#include "array.h" #include "gambatte-array.h"
#include "gbint.h" #include "gbint.h"
class MaxStHq2x : public VideoLink { class MaxStHq2x : public VideoLink {

2
common/videolink/vfilters/maxsthq3x.h
View File

@ -21,7 +21,7 @@
#include "../videolink.h" #include "../videolink.h"
#include "../vfilterinfo.h" #include "../vfilterinfo.h"
#include "array.h" #include "gambatte-array.h"
#include "gbint.h" #include "gbint.h"
class MaxStHq3x : public VideoLink { class MaxStHq3x : public VideoLink {

2
gambatte_qt/src/framework/src/blitterwidgets/qglblitter.h
View File

@ -22,7 +22,7 @@
#include "../blitterwidget.h" #include "../blitterwidget.h"
#include "../dwmcontrol.h" #include "../dwmcontrol.h"
#include "persistcheckbox.h" #include "persistcheckbox.h"
#include "array.h" #include "gambatte-array.h"
#include <memory> #include <memory>
class QGLBlitter : public BlitterWidget { class QGLBlitter : public BlitterWidget {

2
gambatte_qt/src/framework/src/blitterwidgets/x11blitter.h
View File

@ -21,7 +21,7 @@
#include "../blitterwidget.h" #include "../blitterwidget.h"
#include "persistcheckbox.h" #include "persistcheckbox.h"
#include "array.h" #include "gambatte-array.h"
#include <memory> #include <memory>
class X11Blitter : public BlitterWidget { class X11Blitter : public BlitterWidget {

18
libgambatte/libretro/jni/Android.mk Normal file
View File

@ -0,0 +1,18 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
COMMON_DIR := ../../../common
INCLUDE_DIR := ../../include
RESAMPLER_DIR := $(COMMON_DIR)/resample/src
RESAMPLER_DIR_INCLUDE := $(COMMON_DIR)/resample
EMU_DIR := ../../src
LIBRETRO_DIR := ../
LOCAL_MODULE := libretro
LOCAL_SRC_FILES := $(EMU_DIR)/bitmap_font.cpp $(EMU_DIR)/cpu.cpp $(EMU_DIR)/gambatte.cpp $(EMU_DIR)/initstate.cpp $(EMU_DIR)/interrupter.cpp $(EMU_DIR)/interruptrequester.cpp $(EMU_DIR)/memory.cpp $(EMU_DIR)/sound.cpp $(EMU_DIR)/state_osd_elements.cpp $(EMU_DIR)/statesaver.cpp $(EMU_DIR)/tima.cpp $(EMU_DIR)/video.cpp $(EMU_DIR)/file/file.cpp $(EMU_DIR)/mem/cartridge.cpp $(EMU_DIR)/mem/memptrs.cpp $(EMU_DIR)/mem/rtc.cpp $(EMU_DIR)/sound/channel1.cpp $(EMU_DIR)/sound/channel2.cpp $(EMU_DIR)/sound/channel3.cpp $(EMU_DIR)/sound/channel4.cpp $(EMU_DIR)/sound/duty_unit.cpp $(EMU_DIR)/sound/envelope_unit.cpp $(EMU_DIR)/sound/length_counter.cpp $(EMU_DIR)/video/ly_counter.cpp $(EMU_DIR)/video/lyc_irq.cpp $(EMU_DIR)/video/next_m0_time.cpp $(EMU_DIR)/video/ppu.cpp $(EMU_DIR)/video/sprite_mapper.cpp $(LIBRETRO_DIR)/libretro.cpp $(RESAMPLER_DIR)/chainresampler.cpp $(RESAMPLER_DIR)/i0.cpp $(RESAMPLER_DIR)/makesinckernel.cpp $(RESAMPLER_DIR)/resamplerinfo.cpp $(RESAMPLER_DIR)/u48div.cpp
LOCAL_CXXFLAGS = -DINLINE=inline -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DLSB_FIRST -D__LIBRETRO__
LOCAL_C_INCLUDES = $(EMU_DIR) $(COMMON_DIR) $(RESAMPLER_DIR) $(RESAMPLER_DIR_INCLUDE) $(LIBRETRO_DIR) $(INCLUDE_DIR)
include $(BUILD_SHARED_LIBRARY)

1
libgambatte/libretro/jni/Application.mk Normal file
View File

@ -0,0 +1 @@
APP_STL := stlport_static

2
libgambatte/src/cpu.cpp
View File

@ -17,7 +17,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include "cpu.h" #include "cpu.h"
#include "memory.h" #include "gambatte-memory.h"
#include "savestate.h" #include "savestate.h"
namespace gambatte { namespace gambatte {

2
libgambatte/src/cpu.h
View File

@ -19,7 +19,7 @@
#ifndef CPU_H #ifndef CPU_H
#define CPU_H #define CPU_H
#include "memory.h" #include "gambatte-memory.h"
namespace gambatte { namespace gambatte {

0
libgambatte/src/memory.h → libgambatte/src/gambatte-memory.h
View File

2
libgambatte/src/interrupter.cpp
View File

@ -17,7 +17,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include "interrupter.h" #include "interrupter.h"
#include "memory.h" #include "gambatte-memory.h"
namespace gambatte { namespace gambatte {

2
libgambatte/src/memory.cpp
View File

@ -16,7 +16,7 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include "memory.h" #include "gambatte-memory.h"
#include "video.h" #include "video.h"
#include "sound.h" #include "sound.h"
#include "inputgetter.h" #include "inputgetter.h"

2
libgambatte/src/statesaver.cpp
View File

@ -18,7 +18,7 @@
***************************************************************************/ ***************************************************************************/
#include "statesaver.h" #include "statesaver.h"
#include "savestate.h" #include "savestate.h"
#include "array.h" #include "gambatte-array.h"
#include <stdint.h> #include <stdint.h>
#include <vector> #include <vector>
#include <cstring> #include <cstring>