mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed duplicated symbols

Browse Source
This commit is contained in:
Armin Novak 2022-02-21 16:16:22 +01:00 committed by akallabeth
parent 9b08f446db
commit d1f8c00f7b
7 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/CMakeLists.txt
View File

@ -23,10 +23,10 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config/config.h.in ${CMAKE_CURRENT_BI
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config/buildflags.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/buildflags.h) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config/buildflags.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/buildflags.h)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/freerdp
DESTINATION ${FREERDP_INCLUDE_DIR} DESTINATION ${FREERDP_INCLUDE_DIR}
FILES_MATCHING PATTERN "*.h") FILES_MATCHING PATTERN "*.h")
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/freerdp
DESTINATION ${FREERDP_INCLUDE_DIR} DESTINATION ${FREERDP_INCLUDE_DIR}
FILES_MATCHING PATTERN "*.h") FILES_MATCHING PATTERN "*.h")

12
include/config/buildflags.h.in
View File

@ -1,11 +1,11 @@
#ifndef FREERDP_BUILD_FLAGS_H #ifndef FREERDP_BUILD_FLAGS_H
#define FREERDP_BUILD_FLAGS_H #define FREERDP_BUILD_FLAGS_H
#define CFLAGS "${CMAKE_C_FLAGS}" #define FREERDP_CFLAGS "${CMAKE_C_FLAGS}"
#define COMPILER_ID "${CMAKE_C_COMPILER_ID}" #define FREERDP_COMPILER_ID "${CMAKE_C_COMPILER_ID}"
#define COMPILER_VERSION "${CMAKE_C_COMPILER_VERSION}" #define FREERDP_COMPILER_VERSION "${CMAKE_C_COMPILER_VERSION}"
#define TARGET_ARCH "${TARGET_ARCH}" #define FREERDP_TARGET_ARCH "${TARGET_ARCH}"
#define BUILD_CONFIG "${FREERDP_BUILD_CONFIG}" #define FREERDP_BUILD_CONFIG "${FREERDP_BUILD_CONFIG}"
#define BUILD_TYPE "${CMAKE_BUILD_TYPE}" #define FREERDP_BUILD_TYPE "${CMAKE_BUILD_TYPE}"
#endif /* FREERDP_BUILD_FLAGS_H */ #endif /* FREERDP_BUILD_FLAGS_H */

10
libfreerdp/core/freerdp.c
View File

@ -588,11 +588,11 @@ const char* freerdp_get_version_string(void)
const char* freerdp_get_build_config(void) const char* freerdp_get_build_config(void)
{ {
static const char build_config[] = static const char build_config[] =
"Build configuration: " BUILD_CONFIG "\n" "Build configuration: " FREERDP_BUILD_CONFIG "\n"
"Build type: " BUILD_TYPE "\n" "Build type: " FREERDP_BUILD_TYPE "\n"
"CFLAGS: " CFLAGS "\n" "CFLAGS: " FREERDP_CFLAGS "\n"
"Compiler: " COMPILER_ID ", " COMPILER_VERSION "\n" "Compiler: " FREERDP_COMPILER_ID ", " FREERDP_COMPILER_VERSION "\n"
"Target architecture: " TARGET_ARCH "\n"; "Target architecture: " FREERDP_TARGET_ARCH "\n";
return build_config; return build_config;
} }

12
rdtk/templates/buildflags.h.in
View File

@ -1,11 +1,11 @@
#ifndef RDTK_BUILD_FLAGS_H #ifndef RDTK_BUILD_FLAGS_H
#define RDTK_BUILD_FLAGS_H #define RDTK_BUILD_FLAGS_H
#define CFLAGS "${CMAKE_C_FLAGS}" #define RDTK_CFLAGS "${CMAKE_C_FLAGS}"
#define COMPILER_ID "${CMAKE_C_COMPILER_ID}" #define RDTK_COMPILER_ID "${CMAKE_C_COMPILER_ID}"
#define COMPILER_VERSION "${CMAKE_C_COMPILER_VERSION}" #define RDTK_COMPILER_VERSION "${CMAKE_C_COMPILER_VERSION}"
#define TARGET_ARCH "${TARGET_ARCH}" #define RDTK_TARGET_ARCH "${TARGET_ARCH}"
#define BUILD_CONFIG "${RDTK_BUILD_CONFIG}" #define RDTK_BUILD_CONFIG "${RDTK_BUILD_CONFIG}"
#define BUILD_TYPE "${CMAKE_BUILD_TYPE}" #define RDTK_BUILD_TYPE "${CMAKE_BUILD_TYPE}"
#endif /* RDTK_BUILD_FLAGS_H */ #endif /* RDTK_BUILD_FLAGS_H */

12
uwac/templates/buildflags.h.in
View File

@ -1,11 +1,11 @@
#ifndef UWAC_BUILD_FLAGS_H #ifndef UWAC_BUILD_FLAGS_H
#define UWAC_BUILD_FLAGS_H #define UWAC_BUILD_FLAGS_H
#define CFLAGS "${CMAKE_C_FLAGS}" #define UWAC_CFLAGS "${CMAKE_C_FLAGS}"
#define COMPILER_ID "${CMAKE_C_COMPILER_ID}" #define UWAC_COMPILER_ID "${CMAKE_C_COMPILER_ID}"
#define COMPILER_VERSION "${CMAKE_C_COMPILER_VERSION}" #define UWAC_COMPILER_VERSION "${CMAKE_C_COMPILER_VERSION}"
#define TARGET_ARCH "${TARGET_ARCH}" #define UWAC_TARGET_ARCH "${TARGET_ARCH}"
#define BUILD_CONFIG "${UWAC_BUILD_CONFIG}" #define UWAC_BUILD_CONFIG "${UWAC_BUILD_CONFIG}"
#define BUILD_TYPE "${CMAKE_BUILD_TYPE}" #define UWAC_BUILD_TYPE "${CMAKE_BUILD_TYPE}"
#endif /* UWAC_BUILD_FLAGS_H */ #endif /* UWAC_BUILD_FLAGS_H */

12
winpr/include/config/buildflags.h.in
View File

@ -1,11 +1,11 @@
#ifndef WINPR_BUILD_FLAGS_H #ifndef WINPR_BUILD_FLAGS_H
#define WINPR_BUILD_FLAGS_H #define WINPR_BUILD_FLAGS_H
#define CFLAGS "${CMAKE_C_FLAGS}" #define WINPR_CFLAGS "${CMAKE_C_FLAGS}"
#define COMPILER_ID "${CMAKE_C_COMPILER_ID}" #define WINPR_COMPILER_ID "${CMAKE_C_COMPILER_ID}"
#define COMPILER_VERSION "${CMAKE_C_COMPILER_VERSION}" #define WINPR_COMPILER_VERSION "${CMAKE_C_COMPILER_VERSION}"
#define TARGET_ARCH "${TARGET_ARCH}" #define WINPR_TARGET_ARCH "${TARGET_ARCH}"
#define BUILD_CONFIG "${WINPR_BUILD_CONFIG}" #define WINPR_BUILD_CONFIG "${WINPR_BUILD_CONFIG}"
#define BUILD_TYPE "${CMAKE_BUILD_TYPE}" #define WINPR_BUILD_TYPE "${CMAKE_BUILD_TYPE}"
#endif /* WINPR_BUILD_FLAGS_H */ #endif /* WINPR_BUILD_FLAGS_H */

10
winpr/libwinpr/utils/winpr.c
View File

@ -57,11 +57,11 @@ const char* winpr_get_build_revision(void)
const char* winpr_get_build_config(void) const char* winpr_get_build_config(void)
{ {
static const char build_config[] = static const char build_config[] =
"Build configuration: " BUILD_CONFIG "\n" "Build configuration: " WINPR_BUILD_CONFIG "\n"
"Build type: " BUILD_TYPE "\n" "Build type: " WINPR_BUILD_TYPE "\n"
"CFLAGS: " CFLAGS "\n" "CFLAGS: " WINPR_CFLAGS "\n"
"Compiler: " COMPILER_ID ", " COMPILER_VERSION "\n" "Compiler: " WINPR_COMPILER_ID ", " WINPR_COMPILER_VERSION "\n"
"Target architecture: " TARGET_ARCH "\n"; "Target architecture: " WINPR_TARGET_ARCH "\n";
return build_config; return build_config;
} }