Android NDK fixes.

Makefile

@@ -116,23 +116,22 @@ SRC := *.cpp
 CFLAGS += -Wall -pedantic $(fpic)
 
 ifneq (,$(findstring qnx,$(platform)))
-CFLAGS += -Wc,-std=c++99
+CFLAGS += -Wc,-std=c++98
 else
-CFLAGS += -std=gnu++99
+CFLAGS += -std=c++98
 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

@@ -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

@@ -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

 APP_ABI := all
-APP_STL := c++_static
+APP_STL := stlport_static