Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Libretro
vemulator-libretro
Commits
5ee5e8b8
Commit
5ee5e8b8
authored
Feb 16, 2018
by
MJaoune
Browse files
Android NDK fixes.
parent
a865342c
Changes
4
Show whitespace changes
Inline
Side-by-side
Makefile
View file @
5ee5e8b8
...
...
@@ -116,23 +116,22 @@ SRC := *.cpp
CFLAGS
+=
-Wall
-pedantic
$(fpic)
ifneq
(,$(findstring qnx,$(platform)))
CFLAGS
+=
-Wc
,-std
=
c++9
9
CFLAGS
+=
-Wc
,-std
=
c++9
8
else
CFLAGS
+=
-std
=
gnu
++9
9
CFLAGS
+=
-std
=
c
++9
8
endif
all
:
$(TARGET)
all
:
$(TARGET)
:
$(SRC)
ifeq
($(STATIC_LINKING), 1)
$(AR)
rcs
$
@
$(SRC)
$(AR)
rcs
$
{TARGET}
$(SRC)
else
$(CC)
$(fpic)
$(SHARED)
$(SRC)
$(LDFLAGS)
-o
$
@
$(CC)
$(CFLAGS)
$(fpic)
$(SHARED)
$(SRC)
$(LDFLAGS)
-o
$
{TARGET}
endif
clean
:
rm
-f
*
.so
*
.o
*
.a
rm
-r
libs obj
rm
-f
-r
libs obj
.PHONY
:
clean
cpu.cpp
View file @
5ee5e8b8
...
...
@@ -28,6 +28,7 @@ VE_VMS_CPU::VE_VMS_CPU(VE_VMS_RAM *_ram, VE_VMS_ROM *_rom, VE_VMS_FLASH *_flash,
interruptLevel
=
0
;
currentInterrupt
=
0
;
interruptsMasked
=
false
;
instructionCount
=
0
;
ram
=
_ram
;
rom
=
_rom
;
...
...
cpu.h
View file @
5ee5e8b8
...
...
@@ -136,9 +136,9 @@ private:
double
frequency
;
int
interruptLevel
;
int
currentInterrupt
;
bool
interruptsMasked
=
false
;
bool
interruptsMasked
;
int
instructionCount
=
0
;
int
instructionCount
;
VE_VMS_RAM
*
ram
;
VE_VMS_ROM
*
rom
;
...
...
jni/Application.mk
View file @
5ee5e8b8
APP_ABI
:=
all
APP_STL
:=
c++
_static
APP_STL
:=
stlport
_static
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment