Commit 5ee5e8b8 authored by MJaoune's avatar MJaoune
Browse files

Android NDK fixes.

parent a865342c
...@@ -116,23 +116,22 @@ SRC := *.cpp ...@@ -116,23 +116,22 @@ SRC := *.cpp
CFLAGS += -Wall -pedantic $(fpic) CFLAGS += -Wall -pedantic $(fpic)
ifneq (,$(findstring qnx,$(platform))) ifneq (,$(findstring qnx,$(platform)))
CFLAGS += -Wc,-std=c++99 CFLAGS += -Wc,-std=c++98
else else
CFLAGS += -std=gnu++99 CFLAGS += -std=c++98
endif endif
all: $(TARGET) all:
$(TARGET): $(SRC)
ifeq ($(STATIC_LINKING), 1) ifeq ($(STATIC_LINKING), 1)
$(AR) rcs $@ $(SRC) $(AR) rcs ${TARGET} $(SRC)
else else
$(CC) $(fpic) $(SHARED) $(SRC) $(LDFLAGS) -o $@ $(CC) $(CFLAGS) $(fpic) $(SHARED) $(SRC) $(LDFLAGS) -o ${TARGET}
endif endif
clean: clean:
rm -f *.so *.o *.a rm -f *.so *.o *.a
rm -r libs obj rm -f -r libs obj
.PHONY: clean .PHONY: clean
...@@ -28,6 +28,7 @@ VE_VMS_CPU::VE_VMS_CPU(VE_VMS_RAM *_ram, VE_VMS_ROM *_rom, VE_VMS_FLASH *_flash, ...@@ -28,6 +28,7 @@ VE_VMS_CPU::VE_VMS_CPU(VE_VMS_RAM *_ram, VE_VMS_ROM *_rom, VE_VMS_FLASH *_flash,
interruptLevel = 0; interruptLevel = 0;
currentInterrupt = 0; currentInterrupt = 0;
interruptsMasked = false; interruptsMasked = false;
instructionCount = 0;
ram = _ram; ram = _ram;
rom = _rom; rom = _rom;
......
...@@ -136,9 +136,9 @@ private: ...@@ -136,9 +136,9 @@ private:
double frequency; double frequency;
int interruptLevel; int interruptLevel;
int currentInterrupt; int currentInterrupt;
bool interruptsMasked = false; bool interruptsMasked;
int instructionCount = 0; int instructionCount;
VE_VMS_RAM *ram; VE_VMS_RAM *ram;
VE_VMS_ROM *rom; VE_VMS_ROM *rom;
......
APP_ABI := all APP_ABI := all
APP_STL := c++_static APP_STL := stlport_static
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment