libfreerdp-common: initial commit

CMakeLists.txt

@@ -133,6 +133,7 @@ endif()
 add_subdirectory(libfreerdp-gdi)
 add_subdirectory(libfreerdp-rail)
 add_subdirectory(libfreerdp-cache)
+add_subdirectory(libfreerdp-common)
 add_subdirectory(libfreerdp-chanman)
 add_subdirectory(libfreerdp-core)
 add_subdirectory(libfreerdp-rfx)

include/freerdp/common/bitmap.h

@@ -20,8 +20,7 @@
 #ifndef __BITMAP_H
 #define __BITMAP_H
 
-#include <freerdp/utils/stream.h>
+#include <freerdp/types.h>
-#include <freerdp/utils/memory.h>
 
 boolean bitmap_decompress(uint8* srcData, uint8* dstData, int width, int height, int size, int srcBpp, int dstBpp);
 

include/freerdp/gdi/gdi.h

@@ -22,9 +22,9 @@
 
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
-#include <freerdp/gdi/color.h>
 #include <freerdp/cache/cache.h>
 #include <freerdp/utils/debug.h>
+#include <freerdp/common/color.h>
 
 /* For more information, see [MS-RDPEGDI] */
 

include/freerdp/rail/rail.h

@@ -24,8 +24,8 @@
 #include <freerdp/rail.h>
 #include <freerdp/types.h>
 #include <freerdp/update.h>
-#include <freerdp/gdi/color.h>
 #include <freerdp/utils/stream.h>
+#include <freerdp/common/color.h>
 
 typedef struct rdp_rail rdpRail;
 

libfreerdp-common/CMakeLists.txt

@@ -0,0 +1,30 @@
+# FreeRDP: A Remote Desktop Protocol Client
+# libfreerdp-common cmake build script
+#
+# Copyright 2011 O.S. Systems Software Ltda.
+# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
+# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set(FREERDP_COMMON_SRCS
+	bitmap.c
+	color.c)
+
+add_library(freerdp-common ${FREERDP_COMMON_SRCS})
+
+set_target_properties(freerdp-common PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
+target_link_libraries(freerdp-common freerdp-utils)
+
+install(TARGETS freerdp-common DESTINATION ${CMAKE_INSTALL_LIBDIR})
+

libfreerdp-common/bitmap.c

@@ -17,7 +17,10 @@
  * limitations under the License.
  */
 
-#include "bitmap.h"
+#include <freerdp/utils/stream.h>
+#include <freerdp/utils/memory.h>
+
+#include <freerdp/common/bitmap.h>
 
 /*
    RLE Compressed Bitmap Stream (RLE_BITMAP_STREAM)

libfreerdp-common/color.c

@@ -21,7 +21,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <freerdp/freerdp.h>
-#include <freerdp/gdi/color.h>
+#include <freerdp/common/color.h>
 
 uint32 gdi_color_convert_rgb(uint32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv)
 {

libfreerdp-core/CMakeLists.txt

@@ -24,8 +24,6 @@ include_directories(${ZLIB_INCLUDE_DIRS})
 set(LIBFREERDP_CORE_SRCS
 	activation.c
 	activation.h
-	bitmap.c
-	bitmap.h
 	ber.c
 	ber.h
 	gcc.c
@@ -105,5 +103,6 @@ endif()
 
 target_link_libraries(freerdp-core ${OPENSSL_LIBRARIES})
 target_link_libraries(freerdp-core freerdp-utils)
+target_link_libraries(freerdp-core freerdp-common)
 
 install(TARGETS freerdp-core DESTINATION ${CMAKE_INSTALL_LIBDIR})

libfreerdp-core/orders.c

@@ -18,8 +18,8 @@
  */
 
 #include "window.h"
-#include "bitmap.h"
 #include <freerdp/api.h>
+#include <freerdp/common/bitmap.h>
 
 #include "orders.h"
 

libfreerdp-core/update.c

@@ -18,8 +18,8 @@
  */
 
 #include "update.h"
-#include "bitmap.h"
 #include "surface.h"
+#include <freerdp/common/bitmap.h>
 
 uint8 UPDATE_TYPE_STRINGS[][32] =
 {

libfreerdp-gdi/16bpp.c

@@ -23,7 +23,7 @@
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/gdi/gdi.h>
-#include <freerdp/gdi/color.h>
+#include <freerdp/common/color.h>
 
 #include <freerdp/gdi/pen.h>
 #include <freerdp/gdi/bitmap.h>

libfreerdp-gdi/32bpp.c

@@ -23,7 +23,7 @@
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/gdi/gdi.h>
-#include <freerdp/gdi/color.h>
+#include <freerdp/common/color.h>
 
 #include <freerdp/gdi/pen.h>
 #include <freerdp/gdi/bitmap.h>

libfreerdp-gdi/8bpp.c

@@ -23,7 +23,7 @@
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/gdi/gdi.h>
-#include <freerdp/gdi/color.h>
+#include <freerdp/common/color.h>
 
 #include <freerdp/gdi/pen.h>
 #include <freerdp/gdi/bitmap.h>

libfreerdp-gdi/CMakeLists.txt

@@ -18,7 +18,6 @@
 # limitations under the License.
 
 set(FREERDP_GDI_SRCS
-	color.c
 	8bpp.c
 	16bpp.c
 	32bpp.c
@@ -37,6 +36,7 @@ set(FREERDP_GDI_SRCS
 add_library(freerdp-gdi ${FREERDP_GDI_SRCS})
 
 target_link_libraries(freerdp-gdi freerdp-cache)
+target_link_libraries(freerdp-gdi freerdp-common)
 target_link_libraries(freerdp-gdi freerdp-rfx)
 
 set_target_properties(freerdp-gdi PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")

libfreerdp-gdi/bitmap.c

@@ -23,7 +23,7 @@
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/gdi/gdi.h>
-#include <freerdp/gdi/color.h>
+#include <freerdp/common/color.h>
 
 #include <freerdp/gdi/32bpp.h>
 #include <freerdp/gdi/16bpp.h>

libfreerdp-gdi/gdi.c

@@ -23,8 +23,8 @@
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/constants.h>
-#include <freerdp/gdi/color.h>
 #include <freerdp/utils/bitmap.h>
+#include <freerdp/common/color.h>
 #include <freerdp/rfx/rfx.h>
 
 #include <freerdp/gdi/dc.h>