revamped some files

Jamie-Landeg-Jones · Jun 11, 2012 · a3403ab · a3403ab
1 parent ef3118c
commit a3403ab
Show file tree

Hide file tree

Showing 14 changed files with 983 additions and 599 deletions.
diff --git a/jni/vnc/Android.mk b/jni/vnc/Android.mk
@@ -1,94 +1,76 @@
-
-
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_ARM_MODE := arm
-
-local_c_flags +=  -Wall   -O3 -DLIBVNCSERVER_WITH_WEBSOCKETS -DLIBVNCSERVER_HAVE_LIBPNG
-
-local_src_files:= \
-	input.c \
-	gui.c \
-	adb_method.c \
-	framebuffer_method.c \
-	suinput.c \
-	droidvncserver.c \
- gralloc_method.c \
-	libvncserver/libvncserver/scale.c \
-	libvncserver/libvncserver/main.c \
-	libvncserver/libvncserver/rfbserver.c \
-	libvncserver/libvncserver/rfbregion.c \
-	libvncserver/libvncserver/auth.c \
-	libvncserver/libvncserver/sockets.c \
-	libvncserver/libvncserver/stats.c \
-	libvncserver/libvncserver/corre.c \
-	libvncserver/libvncserver/hextile.c \
-	libvncserver/libvncserver/rre.c \
-	libvncserver/libvncserver/translate.c \
-	libvncserver/libvncserver/cutpaste.c \
-	libvncserver/libvncserver/httpd.c \
-	libvncserver/libvncserver/cursor.c \
-	libvncserver/libvncserver/font.c \
-	libvncserver/libvncserver/draw.c \
-	libvncserver/libvncserver/selbox.c \
-	libvncserver/libvncserver/minilzo.c \
-	libvncserver/libvncserver/vncauth.c \
-	libvncserver/libvncserver/d3des.c \
-	libvncserver/libvncserver/md5.c \
-	libvncserver/libvncserver/cargs.c \
-	libvncserver/libvncserver/ultra.c \
-	libvncserver/libvncserver/zlib.c \
-	libvncserver/libvncserver/zrle.c \
-	libvncserver/libvncserver/zrleoutstream.c \
-	libvncserver/libvncserver/zrlepalettehelper.c \
-	libvncserver/libvncserver/tight.c \
-	libvncserver/libvncserver/zywrletemplate.c \
-	libvncserver/libvncserver/websockets.c
-
-ginger_up := displaybinder.cpp
-
-
-local_c_includes := \
-	$(LOCAL_PATH) \
-	$(LOCAL_PATH)/libvncserver/libvncserver \
-	$(LOCAL_PATH)/libvncserver \
-	$(LOCAL_PATH)/libvncserver/common \
-	$(LOCAL_PATH)/../../zlib \
-	$(LOCAL_PATH)/../../jpeg \
-	$(LOCAL_PATH)/../../openssl/include \
-	$(LOCAL_PATH)/../../libpng \
-
-#######################################
-
-# target
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES += $(local_src_files)
-LOCAL_CFLAGS += $(local_c_flags) -DANDROID_FROYO
-LOCAL_C_INCLUDES += $(local_c_includes)
-
-
-LOCAL_MODULE:= androidvncserver_froyo
-LOCAL_MODULE_TAGS:= optional
-
-LOCAL_STATIC_LIBRARIES := libcutils libz libpng  jpeg
-LOCAL_SHARED_LIBRARIES := libcrypto libssl libhardware
-
-include $(BUILD_EXECUTABLE)
-
-#######################################
-
-# target
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES += $(local_src_files) $(ginger_up)
-LOCAL_CFLAGS += $(local_c_flags)
-LOCAL_C_INCLUDES += $(local_c_includes)
-
-
-LOCAL_MODULE:= androidvncserver_gingerup
-LOCAL_MODULE_TAGS:= optional
-
-LOCAL_STATIC_LIBRARIES := libcutils libz libpng  jpeg
-LOCAL_SHARED_LIBRARIES := libcrypto libssl  libhardware libsurfaceflinger_client libui 
+LIBVNCSERVER_ROOT:=./LibVNCServer-0.9.9
+
+LIBVNCSERVER_SRC_FILES:= \
+	$(LIBVNCSERVER_ROOT)/libvncserver/main.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/rfbserver.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/rfbregion.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/auth.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/sockets.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/stats.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/corre.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/rfbssl_openssl.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/rfbcrypto_openssl.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/hextile.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/rre.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/translate.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/cutpaste.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/httpd.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/cursor.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/font.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/draw.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/websockets.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/selbox.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/cargs.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/ultra.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/scale.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/zlib.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/zrle.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/zrleoutstream.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/zrlepalettehelper.c \
+	$(LIBVNCSERVER_ROOT)/libvncserver/tight.c \
+	$(LIBVNCSERVER_ROOT)/common/d3des.c \
+	$(LIBVNCSERVER_ROOT)/common/vncauth.c \
+	$(LIBVNCSERVER_ROOT)/common/minilzo.c \
+	$(LIBVNCSERVER_ROOT)/common/zywrletemplate.c \
+	$(LIBVNCSERVER_ROOT)/common/turbojpeg.c
+
+LOCAL_CFLAGS  +=  -Wall \
+									-O3 \
+									-DLIBVNCSERVER_WITH_WEBSOCKETS \
+									-DLIBVNCSERVER_HAVE_LIBPNG
+
+LOCAL_LDLIBS +=  -llog -lz -ldl 
+
+LOCAL_SRC_FILES += \
+									 $(LIBVNCSERVER_SRC_FILES)\
+									 droidvncserver.c \
+									 gui.c \
+									 inputMethods/input.c \
+									 screenMethods/adb.c \
+									 screenMethods/framebuffer.c \
+									 screenMethods/gralloc.c \
+									 screenMethods/flinger.c \
+									 suinput/suinput.c 
+
+LOCAL_C_INCLUDES += \
+										$(LOCAL_PATH) \
+										$(LOCAL_PATH)/screenMethods \
+										$(LOCAL_PATH)/inputMethods \
+										$(LOCAL_PATH)/suinput \
+										$(LOCAL_PATH)/../libpng \
+										$(LOCAL_PATH)/../jpeg \
+										$(LOCAL_PATH)/../openssl/include \
+										$(LOCAL_PATH)/$(LIBVNCSERVER_ROOT)/libvncserver \
+										$(LOCAL_PATH)/$(LIBVNCSERVER_ROOT)/common \
+										$(LOCAL_PATH)/$(LIBVNCSERVER_ROOT)/rfb \
+										$(LOCAL_PATH)/$(LIBVNCSERVER_ROOT)/ \
+										$(LOCAL_PATH)/../../nativeMethods/
+
+LOCAL_STATIC_LIBRARIES := libjpeg libpng libssl_static libcrypto_static
+
+LOCAL_MODULE:= androidvncserver
 
 include $(BUILD_EXECUTABLE)