From 3297db7062a06e77afb118d72add4f631098aaca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Sun, 2 Oct 2011 20:28:20 -0400 Subject: [PATCH] libfreerdp-codec: merge with libfreerdp-rfx --- CMakeLists.txt | 3 +- client/Windows/wf_gdi.c | 2 +- client/X11/xf_gdi.c | 2 +- client/X11/xfreerdp.c | 2 +- cunit/test_bitmap.c | 2 +- cunit/test_color.c | 2 +- include/freerdp/{common => codec}/bitmap.h | 0 include/freerdp/{common => codec}/color.h | 0 include/freerdp/{rfx => codec}/rfx.h | 0 include/freerdp/gdi/gdi.h | 2 +- include/freerdp/rail/rail.h | 2 +- .../CMakeLists.txt | 29 +++++++++-------- .../bitmap.c | 8 ++--- .../color.c | 2 +- .../include/bitmap.c | 0 .../librfx.c => libfreerdp-codec/rfx.c | 2 +- .../rfx_bitstream.h | 2 +- .../rfx_constants.h | 1 + .../rfx_decode.c | 1 - .../rfx_decode.h | 3 +- .../rfx_differential.c | 0 .../rfx_differential.h | 2 +- .../rfx_dwt.c | 0 .../rfx_dwt.h | 2 +- .../rfx_encode.c | 0 .../rfx_encode.h | 2 +- .../rfx_pool.c | 0 .../rfx_pool.h | 2 +- .../rfx_quantization.c | 0 .../rfx_quantization.h | 2 +- .../rfx_rlgr.c | 0 .../rfx_rlgr.h | 2 +- .../sse2 => libfreerdp-codec}/rfx_sse2.c | 0 .../sse2 => libfreerdp-codec}/rfx_sse2.h | 0 .../rfx_types.h | 0 libfreerdp-common/CMakeLists.txt | 30 ----------------- libfreerdp-core/orders.c | 2 +- libfreerdp-core/update.c | 2 +- libfreerdp-gdi/16bpp.c | 2 +- libfreerdp-gdi/32bpp.c | 2 +- libfreerdp-gdi/8bpp.c | 2 +- libfreerdp-gdi/bitmap.c | 2 +- libfreerdp-gdi/gdi.c | 2 +- libfreerdp-rfx/sse2/CMakeLists.txt | 32 ------------------- server/X11/xf_peer.c | 2 +- server/X11/xfreerdp.h | 2 +- 46 files changed, 49 insertions(+), 108 deletions(-) rename include/freerdp/{common => codec}/bitmap.h (100%) rename include/freerdp/{common => codec}/color.h (100%) rename include/freerdp/{rfx => codec}/rfx.h (100%) rename {libfreerdp-rfx => libfreerdp-codec}/CMakeLists.txt (69%) rename {libfreerdp-common => libfreerdp-codec}/bitmap.c (98%) rename {libfreerdp-common => libfreerdp-codec}/color.c (99%) rename libfreerdp-common/bitmap_inc.c => libfreerdp-codec/include/bitmap.c (100%) rename libfreerdp-rfx/librfx.c => libfreerdp-codec/rfx.c (99%) rename {libfreerdp-rfx => libfreerdp-codec}/rfx_bitstream.h (98%) rename {libfreerdp-rfx => libfreerdp-codec}/rfx_constants.h (99%) rename {libfreerdp-rfx => libfreerdp-codec}/rfx_decode.c (99%) rename {libfreerdp-rfx => libfreerdp-codec}/rfx_decode.h (97%) rename {libfreerdp-rfx => libfreerdp-codec}/rfx_differential.c (100%) rename {libfreerdp-rfx => libfreerdp-codec}/rfx_differential.h (96%) rename {libfreerdp-rfx => libfreerdp-codec}/rfx_dwt.c (100%) rename {libfreerdp-rfx => libfreerdp-codec}/rfx_dwt.h (96%) rename {libfreerdp-rfx => libfreerdp-codec}/rfx_encode.c (100%) rename {libfreerdp-rfx => libfreerdp-codec}/rfx_encode.h (97%) rename {libfreerdp-rfx => libfreerdp-codec}/rfx_pool.c (100%) rename {libfreerdp-rfx => libfreerdp-codec}/rfx_pool.h (97%) rename {libfreerdp-rfx => libfreerdp-codec}/rfx_quantization.c (100%) rename {libfreerdp-rfx => libfreerdp-codec}/rfx_quantization.h (96%) rename {libfreerdp-rfx => libfreerdp-codec}/rfx_rlgr.c (100%) rename {libfreerdp-rfx => libfreerdp-codec}/rfx_rlgr.h (96%) rename {libfreerdp-rfx/sse2 => libfreerdp-codec}/rfx_sse2.c (100%) rename {libfreerdp-rfx/sse2 => libfreerdp-codec}/rfx_sse2.h (100%) rename {libfreerdp-rfx => libfreerdp-codec}/rfx_types.h (100%) delete mode 100644 libfreerdp-common/CMakeLists.txt delete mode 100644 libfreerdp-rfx/sse2/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index fb4c0adff..aba304698 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,10 +147,9 @@ endif() add_subdirectory(libfreerdp-gdi) add_subdirectory(libfreerdp-rail) add_subdirectory(libfreerdp-cache) -add_subdirectory(libfreerdp-common) +add_subdirectory(libfreerdp-codec) add_subdirectory(libfreerdp-chanman) add_subdirectory(libfreerdp-core) -add_subdirectory(libfreerdp-rfx) if(NOT WIN32) add_subdirectory(channels) diff --git a/client/Windows/wf_gdi.c b/client/Windows/wf_gdi.c index f4877ec40..791c8c507 100644 --- a/client/Windows/wf_gdi.c +++ b/client/Windows/wf_gdi.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include "wfreerdp.h" diff --git a/client/X11/xf_gdi.c b/client/X11/xf_gdi.c index e0ebab99d..2d89f02f3 100644 --- a/client/X11/xf_gdi.c +++ b/client/X11/xf_gdi.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "xf_gdi.h" diff --git a/client/X11/xfreerdp.c b/client/X11/xfreerdp.c index 6c63dcc6f..3a30cdd1a 100644 --- a/client/X11/xfreerdp.c +++ b/client/X11/xfreerdp.c @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/cunit/test_bitmap.c b/cunit/test_bitmap.c index 4f780b5bf..c480a6df1 100644 --- a/cunit/test_bitmap.c +++ b/cunit/test_bitmap.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "test_bitmap.h" diff --git a/cunit/test_color.c b/cunit/test_color.c index e29776e14..d353b6b68 100644 --- a/cunit/test_color.c +++ b/cunit/test_color.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "test_color.h" int init_color_suite(void) diff --git a/include/freerdp/common/bitmap.h b/include/freerdp/codec/bitmap.h similarity index 100% rename from include/freerdp/common/bitmap.h rename to include/freerdp/codec/bitmap.h diff --git a/include/freerdp/common/color.h b/include/freerdp/codec/color.h similarity index 100% rename from include/freerdp/common/color.h rename to include/freerdp/codec/color.h diff --git a/include/freerdp/rfx/rfx.h b/include/freerdp/codec/rfx.h similarity index 100% rename from include/freerdp/rfx/rfx.h rename to include/freerdp/codec/rfx.h diff --git a/include/freerdp/gdi/gdi.h b/include/freerdp/gdi/gdi.h index e06fda8e8..494d77d9a 100644 --- a/include/freerdp/gdi/gdi.h +++ b/include/freerdp/gdi/gdi.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include /* For more information, see [MS-RDPEGDI] */ diff --git a/include/freerdp/rail/rail.h b/include/freerdp/rail/rail.h index 8cb920f29..b6dcb8563 100644 --- a/include/freerdp/rail/rail.h +++ b/include/freerdp/rail/rail.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include typedef struct rdp_rail rdpRail; diff --git a/libfreerdp-rfx/CMakeLists.txt b/libfreerdp-codec/CMakeLists.txt similarity index 69% rename from libfreerdp-rfx/CMakeLists.txt rename to libfreerdp-codec/CMakeLists.txt index 6ff170e33..e87c243ae 100644 --- a/libfreerdp-rfx/CMakeLists.txt +++ b/libfreerdp-codec/CMakeLists.txt @@ -1,5 +1,5 @@ # FreeRDP: A Remote Desktop Protocol Client -# libfreerdp-core cmake build script +# libfreerdp-codec cmake build script # # Copyright 2011 O.S. Systems Software Ltda. # Copyright 2011 Otavio Salvador @@ -17,7 +17,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -set(LIBFREERDP_RFX_SRCS +set(FREERDP_CODEC_SRCS + bitmap.c + color.c rfx_bitstream.h rfx_constants.h rfx_decode.c @@ -35,19 +37,20 @@ set(LIBFREERDP_RFX_SRCS rfx_rlgr.c rfx_rlgr.h rfx_types.h - librfx.c + rfx.c ) -add_library(freerdp-rfx ${LIBFREERDP_RFX_SRCS}) - -set_target_properties(freerdp-rfx PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib") - -target_link_libraries(freerdp-rfx freerdp-utils) - if(WITH_SSE2) - include_directories(sse2) - add_subdirectory(sse2) - target_link_libraries(freerdp-rfx freerdp-rfx-sse2) + set(FREERDP_CODEC_SRCS ${FREERDP_CODEC_SRCS} + rfx_sse2.c + rfx_sse2.h +) endif() -install(TARGETS freerdp-rfx DESTINATION ${CMAKE_INSTALL_LIBDIR}) +add_library(freerdp-codec ${FREERDP_CODEC_SRCS}) + +set_target_properties(freerdp-codec PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib") +target_link_libraries(freerdp-codec freerdp-utils) + +install(TARGETS freerdp-codec DESTINATION ${CMAKE_INSTALL_LIBDIR}) + diff --git a/libfreerdp-common/bitmap.c b/libfreerdp-codec/bitmap.c similarity index 98% rename from libfreerdp-common/bitmap.c rename to libfreerdp-codec/bitmap.c index 8ff7917d9..024098282 100644 --- a/libfreerdp-common/bitmap.c +++ b/libfreerdp-codec/bitmap.c @@ -20,7 +20,7 @@ #include #include -#include +#include /* RLE Compressed Bitmap Stream (RLE_BITMAP_STREAM) @@ -202,7 +202,7 @@ static uint32 ExtractRunLength(uint32 code, uint8* pbOrderHdr, uint32* advance) #define WRITEFIRSTLINEFGBGIMAGE WriteFirstLineFgBgImage8to8 #define RLEDECOMPRESS RleDecompress8to8 #define RLEEXTRA -#include "bitmap_inc.c" +#include "include/bitmap.c" #undef DESTWRITEPIXEL #undef DESTREADPIXEL @@ -222,7 +222,7 @@ static uint32 ExtractRunLength(uint32 code, uint8* pbOrderHdr, uint32* advance) #define WRITEFIRSTLINEFGBGIMAGE WriteFirstLineFgBgImage16to16 #define RLEDECOMPRESS RleDecompress16to16 #define RLEEXTRA -#include "bitmap_inc.c" +#include "include/bitmap.c" #undef DESTWRITEPIXEL #undef DESTREADPIXEL @@ -245,7 +245,7 @@ static uint32 ExtractRunLength(uint32 code, uint8* pbOrderHdr, uint32* advance) #define WRITEFIRSTLINEFGBGIMAGE WriteFirstLineFgBgImage24to24 #define RLEDECOMPRESS RleDecompress24to24 #define RLEEXTRA -#include "bitmap_inc.c" +#include "include/bitmap.c" #define IN_UINT8_MV(_p) (*((_p)++)) diff --git a/libfreerdp-common/color.c b/libfreerdp-codec/color.c similarity index 99% rename from libfreerdp-common/color.c rename to libfreerdp-codec/color.c index 6c5280b39..e07d29cfc 100644 --- a/libfreerdp-common/color.c +++ b/libfreerdp-codec/color.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include int freerdp_get_pixel(uint8 * data, int x, int y, int width, int height, int bpp) { diff --git a/libfreerdp-common/bitmap_inc.c b/libfreerdp-codec/include/bitmap.c similarity index 100% rename from libfreerdp-common/bitmap_inc.c rename to libfreerdp-codec/include/bitmap.c diff --git a/libfreerdp-rfx/librfx.c b/libfreerdp-codec/rfx.c similarity index 99% rename from libfreerdp-rfx/librfx.c rename to libfreerdp-codec/rfx.c index 9c0f26343..8d13548f4 100644 --- a/libfreerdp-rfx/librfx.c +++ b/libfreerdp-codec/rfx.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include "rfx_constants.h" diff --git a/libfreerdp-rfx/rfx_bitstream.h b/libfreerdp-codec/rfx_bitstream.h similarity index 98% rename from libfreerdp-rfx/rfx_bitstream.h rename to libfreerdp-codec/rfx_bitstream.h index 9bf9f43d1..29368f638 100644 --- a/libfreerdp-rfx/rfx_bitstream.h +++ b/libfreerdp-codec/rfx_bitstream.h @@ -20,7 +20,7 @@ #ifndef __RFX_BITSTREAM_H #define __RFX_BITSTREAM_H -#include +#include struct _RFX_BITSTREAM { diff --git a/libfreerdp-rfx/rfx_constants.h b/libfreerdp-codec/rfx_constants.h similarity index 99% rename from libfreerdp-rfx/rfx_constants.h rename to libfreerdp-codec/rfx_constants.h index 08d516cd1..bf1288635 100644 --- a/libfreerdp-rfx/rfx_constants.h +++ b/libfreerdp-codec/rfx_constants.h @@ -57,3 +57,4 @@ #define SCALAR_QUANTIZATION 0x1 #endif /* __RFX_CONSTANTS_H */ + diff --git a/libfreerdp-rfx/rfx_decode.c b/libfreerdp-codec/rfx_decode.c similarity index 99% rename from libfreerdp-rfx/rfx_decode.c rename to libfreerdp-codec/rfx_decode.c index ec14e72ca..e07c7dd6b 100644 --- a/libfreerdp-rfx/rfx_decode.c +++ b/libfreerdp-codec/rfx_decode.c @@ -26,7 +26,6 @@ #include "rfx_differential.h" #include "rfx_quantization.h" #include "rfx_dwt.h" -#include "rfx_types.h" #include "rfx_decode.h" diff --git a/libfreerdp-rfx/rfx_decode.h b/libfreerdp-codec/rfx_decode.h similarity index 97% rename from libfreerdp-rfx/rfx_decode.h rename to libfreerdp-codec/rfx_decode.h index f7f7f29cf..874ad2eac 100644 --- a/libfreerdp-rfx/rfx_decode.h +++ b/libfreerdp-codec/rfx_decode.h @@ -20,7 +20,7 @@ #ifndef __RFX_DECODE_H #define __RFX_DECODE_H -#include +#include void rfx_decode_ycbcr_to_rgb(sint16* y_r_buf, sint16* cb_g_buf, sint16* cr_b_buf); @@ -30,3 +30,4 @@ void rfx_decode_rgb(RFX_CONTEXT* context, STREAM* data_in, int cr_size, const uint32 * cr_quants, uint8* rgb_buffer); #endif /* __RFX_DECODE_H */ + diff --git a/libfreerdp-rfx/rfx_differential.c b/libfreerdp-codec/rfx_differential.c similarity index 100% rename from libfreerdp-rfx/rfx_differential.c rename to libfreerdp-codec/rfx_differential.c diff --git a/libfreerdp-rfx/rfx_differential.h b/libfreerdp-codec/rfx_differential.h similarity index 96% rename from libfreerdp-rfx/rfx_differential.h rename to libfreerdp-codec/rfx_differential.h index 12619aa40..58b08b9c7 100644 --- a/libfreerdp-rfx/rfx_differential.h +++ b/libfreerdp-codec/rfx_differential.h @@ -20,7 +20,7 @@ #ifndef __RFX_DIFFERENTIAL_H #define __RFX_DIFFERENTIAL_H -#include +#include void rfx_differential_decode(sint16* buffer, int buffer_size); void rfx_differential_encode(sint16* buffer, int buffer_size); diff --git a/libfreerdp-rfx/rfx_dwt.c b/libfreerdp-codec/rfx_dwt.c similarity index 100% rename from libfreerdp-rfx/rfx_dwt.c rename to libfreerdp-codec/rfx_dwt.c diff --git a/libfreerdp-rfx/rfx_dwt.h b/libfreerdp-codec/rfx_dwt.h similarity index 96% rename from libfreerdp-rfx/rfx_dwt.h rename to libfreerdp-codec/rfx_dwt.h index ab07fd8b7..cfdc4bc16 100644 --- a/libfreerdp-rfx/rfx_dwt.h +++ b/libfreerdp-codec/rfx_dwt.h @@ -20,7 +20,7 @@ #ifndef __RFX_DWT_H #define __RFX_DWT_H -#include +#include void rfx_dwt_2d_decode(sint16* buffer, sint16* dwt_buffer); void rfx_dwt_2d_encode(sint16* buffer, sint16* dwt_buffer); diff --git a/libfreerdp-rfx/rfx_encode.c b/libfreerdp-codec/rfx_encode.c similarity index 100% rename from libfreerdp-rfx/rfx_encode.c rename to libfreerdp-codec/rfx_encode.c diff --git a/libfreerdp-rfx/rfx_encode.h b/libfreerdp-codec/rfx_encode.h similarity index 97% rename from libfreerdp-rfx/rfx_encode.h rename to libfreerdp-codec/rfx_encode.h index 465e2fc90..6fa1e9596 100644 --- a/libfreerdp-rfx/rfx_encode.h +++ b/libfreerdp-codec/rfx_encode.h @@ -20,7 +20,7 @@ #ifndef __RFX_ENCODE_H #define __RFX_ENCODE_H -#include +#include void rfx_encode_rgb_to_ycbcr(sint16* y_r_buf, sint16* cb_g_buf, sint16* cr_b_buf); diff --git a/libfreerdp-rfx/rfx_pool.c b/libfreerdp-codec/rfx_pool.c similarity index 100% rename from libfreerdp-rfx/rfx_pool.c rename to libfreerdp-codec/rfx_pool.c diff --git a/libfreerdp-rfx/rfx_pool.h b/libfreerdp-codec/rfx_pool.h similarity index 97% rename from libfreerdp-rfx/rfx_pool.h rename to libfreerdp-codec/rfx_pool.h index 2843daf11..4f1ff81f8 100644 --- a/libfreerdp-rfx/rfx_pool.h +++ b/libfreerdp-codec/rfx_pool.h @@ -20,7 +20,7 @@ #ifndef __RFX_POOL_H #define __RFX_POOL_H -#include +#include struct _RFX_POOL { diff --git a/libfreerdp-rfx/rfx_quantization.c b/libfreerdp-codec/rfx_quantization.c similarity index 100% rename from libfreerdp-rfx/rfx_quantization.c rename to libfreerdp-codec/rfx_quantization.c diff --git a/libfreerdp-rfx/rfx_quantization.h b/libfreerdp-codec/rfx_quantization.h similarity index 96% rename from libfreerdp-rfx/rfx_quantization.h rename to libfreerdp-codec/rfx_quantization.h index 41cf842df..9fbfa5143 100644 --- a/libfreerdp-rfx/rfx_quantization.h +++ b/libfreerdp-codec/rfx_quantization.h @@ -20,7 +20,7 @@ #ifndef __RFX_QUANTIZATION_H #define __RFX_QUANTIZATION_H -#include +#include void rfx_quantization_decode(sint16* buffer, const uint32* quantization_values); void rfx_quantization_encode(sint16* buffer, const uint32* quantization_values); diff --git a/libfreerdp-rfx/rfx_rlgr.c b/libfreerdp-codec/rfx_rlgr.c similarity index 100% rename from libfreerdp-rfx/rfx_rlgr.c rename to libfreerdp-codec/rfx_rlgr.c diff --git a/libfreerdp-rfx/rfx_rlgr.h b/libfreerdp-codec/rfx_rlgr.h similarity index 96% rename from libfreerdp-rfx/rfx_rlgr.h rename to libfreerdp-codec/rfx_rlgr.h index 5b680afeb..b470bd5a8 100644 --- a/libfreerdp-rfx/rfx_rlgr.h +++ b/libfreerdp-codec/rfx_rlgr.h @@ -20,7 +20,7 @@ #ifndef __RFX_RLGR_H #define __RFX_RLGR_H -#include +#include int rfx_rlgr_decode(RLGR_MODE mode, const uint8* data, int data_size, sint16* buffer, int buffer_size); int rfx_rlgr_encode(RLGR_MODE mode, const sint16* data, int data_size, uint8* buffer, int buffer_size); diff --git a/libfreerdp-rfx/sse2/rfx_sse2.c b/libfreerdp-codec/rfx_sse2.c similarity index 100% rename from libfreerdp-rfx/sse2/rfx_sse2.c rename to libfreerdp-codec/rfx_sse2.c diff --git a/libfreerdp-rfx/sse2/rfx_sse2.h b/libfreerdp-codec/rfx_sse2.h similarity index 100% rename from libfreerdp-rfx/sse2/rfx_sse2.h rename to libfreerdp-codec/rfx_sse2.h diff --git a/libfreerdp-rfx/rfx_types.h b/libfreerdp-codec/rfx_types.h similarity index 100% rename from libfreerdp-rfx/rfx_types.h rename to libfreerdp-codec/rfx_types.h diff --git a/libfreerdp-common/CMakeLists.txt b/libfreerdp-common/CMakeLists.txt deleted file mode 100644 index 4af339be8..000000000 --- a/libfreerdp-common/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -# FreeRDP: A Remote Desktop Protocol Client -# libfreerdp-common cmake build script -# -# Copyright 2011 O.S. Systems Software Ltda. -# Copyright 2011 Otavio Salvador -# Copyright 2011 Marc-Andre Moreau -# -# 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}) - diff --git a/libfreerdp-core/orders.c b/libfreerdp-core/orders.c index e441aab4f..a5681c8b8 100644 --- a/libfreerdp-core/orders.c +++ b/libfreerdp-core/orders.c @@ -19,7 +19,7 @@ #include "window.h" #include -#include +#include #include "orders.h" diff --git a/libfreerdp-core/update.c b/libfreerdp-core/update.c index cf9fea414..751b734c1 100644 --- a/libfreerdp-core/update.c +++ b/libfreerdp-core/update.c @@ -19,7 +19,7 @@ #include "update.h" #include "surface.h" -#include +#include uint8 UPDATE_TYPE_STRINGS[][32] = { diff --git a/libfreerdp-gdi/16bpp.c b/libfreerdp-gdi/16bpp.c index 22d48fc1b..b1b21bb33 100644 --- a/libfreerdp-gdi/16bpp.c +++ b/libfreerdp-gdi/16bpp.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/libfreerdp-gdi/32bpp.c b/libfreerdp-gdi/32bpp.c index 6e5055297..fe8ad8a9b 100644 --- a/libfreerdp-gdi/32bpp.c +++ b/libfreerdp-gdi/32bpp.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/libfreerdp-gdi/8bpp.c b/libfreerdp-gdi/8bpp.c index 27cc1d3c8..c4f261563 100644 --- a/libfreerdp-gdi/8bpp.c +++ b/libfreerdp-gdi/8bpp.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/libfreerdp-gdi/bitmap.c b/libfreerdp-gdi/bitmap.c index b0d50932e..33f8d0080 100644 --- a/libfreerdp-gdi/bitmap.c +++ b/libfreerdp-gdi/bitmap.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/libfreerdp-gdi/gdi.c b/libfreerdp-gdi/gdi.c index f70786cf0..5074482ff 100644 --- a/libfreerdp-gdi/gdi.c +++ b/libfreerdp-gdi/gdi.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/libfreerdp-rfx/sse2/CMakeLists.txt b/libfreerdp-rfx/sse2/CMakeLists.txt deleted file mode 100644 index 671d3a13d..000000000 --- a/libfreerdp-rfx/sse2/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -# FreeRDP: A Remote Desktop Protocol Client -# libfreerdp-core cmake build script -# -# Copyright 2011 O.S. Systems Software Ltda. -# Copyright 2011 Otavio Salvador -# Copyright 2011 Marc-Andre Moreau -# -# 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(LIBFREERDP_RFX_SSE2_SRCS - rfx_sse2.c - rfx_sse2.h -) - -include_directories(..) - -add_library(freerdp-rfx-sse2 ${LIBFREERDP_RFX_SSE2_SRCS}) - -if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") - set_target_properties(freerdp-rfx-sse2 PROPERTIES COMPILE_FLAGS "-fPIC") -endif() -install(TARGETS freerdp-rfx-sse2 DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/server/X11/xf_peer.c b/server/X11/xf_peer.c index 9ef58f343..efbc5e497 100644 --- a/server/X11/xf_peer.c +++ b/server/X11/xf_peer.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include extern char* xf_pcap_file; diff --git a/server/X11/xfreerdp.h b/server/X11/xfreerdp.h index 93c0d4438..8dd8b05f2 100644 --- a/server/X11/xfreerdp.h +++ b/server/X11/xfreerdp.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include struct xf_info {