Updated CamSvcSrv

.gitignore

@@ -1,7 +1,14 @@
+.metadata
+RemoteSystemsTempFiles
+
 */gen/
 */libs/
 */obj/
+*/.settings
 
 !*/bin/
 */bin/*
 !*/bin/*.apk
+
+CamSvcSrv/jni/Upgrade.bat
+OpenCV-android-sdk

CamSvcSrv/.classpath

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

CamSvcSrv/jni/Android.mk

@@ -6,15 +6,15 @@ OPENCV_LIB_TYPE        := STATIC
 OPENCV_INSTALL_MODULES := on
 OPENCV_CAMERA_MODULES  := on
 
-OPENCV_MK_PATH := ..\OpenCV-2.4.9-android-sdk\sdk\native\jni
+OPENCV_MK_PATH := ..\OpenCV-android-sdk\sdk\native\jni
 
 include $(OPENCV_MK_PATH)/OpenCV.mk
 
 LOCAL_MODULE := appnativecpp_opencv_jni
-LOCAL_SRC_FILES := appnative.cpp Main.c Globals.c OSNet.c OSCriticalSection.c OSThread.c OSMisc.c OSTime.c OSCore.c
+LOCAL_SRC_FILES := appnative.cpp Main.cpp Globals.cpp OSNet.c OSCriticalSection.c OSThread.c OSMisc.c OSTime.c OSCore.c
 LOCAL_LDLIBS += -llog -ldl
 
 # -x c++ because of OpenCV...
-LOCAL_CFLAGS += -Wall -Wextra -DDISABLE_GUI_REMOTEWEBCAMMULTISRV -DDISABLE_TIMER_RECORDING -DOPENCV249 -x c++
+LOCAL_CFLAGS += -Wall -Wextra -D DISABLE_GUI_REMOTEWEBCAMMULTISRV -D DISABLE_TIMER_RECORDING -D DISABLE_CUSTOM_BAUDRATE -D USE_OPENCV_HIGHGUI_CPP_API -x c++
 
 include $(BUILD_SHARED_LIBRARY)