diff --git a/CMakeLists.txt b/CMakeLists.txt index 638e140c..cf48f0e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,13 +1,18 @@ cmake_minimum_required(VERSION 2.8.12) ##tool chain file.cmake -set(CMAKE_C_FLAGS "-g -Wall -O3 -m32") -set( CMAKE_CXX_FLAGS $(CMAKE_C_FLAGS) ) +#set(CMAKE_COMPILER_IS_GNUCXX TRUE) -#cmake cross build find_library to find in this directory -set(CMAKE_COMPILER_IS_GNUCXX TRUE) +# Skip the platform compiler checks for cross compiling +set (CMAKE_CXX_COMPILER_WORKS TRUE) +set (CMAKE_C_COMPILER_WORKS TRUE) -set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set( CMAKE_C_FLAGS "-g -Wall -O3 -m64" ) +set( CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS} ) + +#cmake cross build find_library to find in this directory +set(CMAKE_MACOSX_RPATH TRUE) +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) @@ -21,15 +26,23 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON) set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON) set(BUILD_SHARED_LIBS ON) -set( CMAKE_VERBOSE_MAKEFILE OFF ) +set(CMAKE_VERBOSE_MAKEFILE OFF ) set(CMAKE_BUILD_TYPE Debug) #set ( CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/build.cmake ) project(App0OnQQt) -set( ${PROJECT_NAME}_VERSION_MAJOR 0) -set( ${PROJECT_NAME}_VERSION_MINOR 1) +set( ${PROJECT_NAME}_VERSION_MAJOR 1) +set( ${PROJECT_NAME}_VERSION_MINOR 0) +set(QT5 TRUE) -add_definitions( -D__QT5__ -D__WIN__ -DUNICODE ) +add_definitions( -D__QT5__ -DUNICODE ) +IF (WIN32) + add_definitions( -D__WIN__ ) +ELSEIF (APPLE) + add_definitions( -D__DARWIN__ ) +ELSEIF (UNIX) + add_definitions( -D__LINUX__ ) +ENDIF () add_subdirectory( src ) add_subdirectory( examples/qqtframe ) diff --git a/cmake/function.cmake b/cmake/function.cmake index 26bfe788..f3e76f6b 100644 --- a/cmake/function.cmake +++ b/cmake/function.cmake @@ -24,3 +24,55 @@ macro( filter_out FILTERS INPUTS OUTPUTS ) endforeach( INP ${INPUTS} ) set( ${OUTPUTS} ${FOUT} ) endmacro( filter_out FILTERS INPUTS OUTPUTS ) + +macro(find_framework frameworkname frameworkpath) + find_library(FRAMEWORK_${frameworkname} + NAMES ${frameworkname} + PATHS ${CMAKE_OSX_SYSROOT}/System/Library + PATH_SUFFIXES Frameworks + NO_DEFAULT_PATH) + if( ${FRAMEWORK_${frameworkname}} STREQUAL FRAMEWORK_${frameworkname}-NOTFOUND) + #MESSAGE(ERROR ": Framework ${frameworkname} not found") + else() + set ( ${frameworkpath} ${FRAMEWORK_${frameworkname}}) + #MESSAGE(STATUS "Framework ${frameworkname} found at ${FRAMEWORK_${frameworkname}}") + endif() +endmacro(find_framework) + +macro(link_framework projectname) + set(macOSFrameworks Cocoa IOKit DiskArbitration) + foreach(loop_var ${macOSFrameworks}) + #message(${loop_var}) + find_framework (${loop_var} frameworkpath) + target_link_libraries(${projectname} ${frameworkpath}) + endforeach(loop_var) +endmacro(link_framework) + + +macro(link_qt5_libraries projectname) + set(Qt5Libs Core Widgets Gui Xml Sql Network PrintSupport SerialPort) + foreach(loop_var ${Qt5Libs}) + #message(Qt5${loop_var}) + find_package(Qt5${loop_var}) + target_link_libraries(${projectname} Qt5::${loop_var}) + endforeach(loop_var) +endmacro(link_qt5_libraries) + +#todo: need test +macro(link_qt4_libraries projectname) + set(Qt4Libs Core Widgets Gui Xml Sql Network PrintSupport SerialPort) + foreach(loop_var ${Qt4Libs}) + #message(Qt4${loop_var}) + find_package(Qt4${loop_var}) + target_link_libraries(${projectname} Qt4::${loop_var}) + endforeach(loop_var) +endmacro(link_qt4_libraries) + +macro (link_qt_libraries projectname) + if(QT5) + link_qt5_libraries(${projectname}) + elseif(QT4) + link_qt4_libraries(${projectname}) + endif() +endmacro(link_qt_libraries) + diff --git a/cmake/ios64.cmake b/cmake/ios64.cmake new file mode 100644 index 00000000..4ca84e9e --- /dev/null +++ b/cmake/ios64.cmake @@ -0,0 +1,132 @@ +# This file is based off of the Platform/Darwin.cmake and Platform/UnixPaths.cmake +# files which are included with CMake 2.8.4 +# It has been altered for iOS development + +# Options: +# +# IOS_PLATFORM = OS (default) or SIMULATOR +# This decides if SDKS will be selected from the iPhoneOS.platform or iPhoneSimulator.platform folders +# OS - the default, used to build for iPhone and iPad physical devices, which have an arm arch. +# SIMULATOR - used to build for the Simulator platforms, which have an x86 arch. +# +# CMAKE_IOS_DEVELOPER_ROOT = automatic(default) or /path/to/platform/Developer folder +# By default this location is automatcially chosen based on the IOS_PLATFORM value above. +# If set manually, it will override the default location and force the user of a particular Developer Platform +# +# CMAKE_IOS_SDK_ROOT = automatic(default) or /path/to/platform/Developer/SDKs/SDK folder +# By default this location is automatcially chosen based on the CMAKE_IOS_DEVELOPER_ROOT value. +# In this case it will always be the most up-to-date SDK found in the CMAKE_IOS_DEVELOPER_ROOT path. +# If set manually, this will force the use of a specific SDK version + +# Standard settings +set (CMAKE_SYSTEM_NAME Darwin) +set (CMAKE_SYSTEM_VERSION 1 ) +set (UNIX True) +set (APPLE True) +set (IOS True) + +# Force the compilers to gcc for iOS +include (CMakeForceCompiler) +#CMAKE_FORCE_C_COMPILER (gcc gcc) +#CMAKE_FORCE_CXX_COMPILER (g++ g++) +CMAKE_FORCE_C_COMPILER ("/usr/bin/gcc" gcc) +CMAKE_FORCE_CXX_COMPILER ("/usr/bin/g++" g++) + +# Skip the platform compiler checks for cross compiling +set (CMAKE_CXX_COMPILER_WORKS TRUE) +set (CMAKE_C_COMPILER_WORKS TRUE) + +# All iOS/Darwin specific settings - some may be redundant +set (CMAKE_SHARED_LIBRARY_PREFIX "lib") +set (CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") +set (CMAKE_SHARED_MODULE_PREFIX "lib") +set (CMAKE_SHARED_MODULE_SUFFIX ".so") +set (CMAKE_MODULE_EXISTS 1) +set (CMAKE_DL_LIBS "") + +set (CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ") +set (CMAKE_C_OSX_CURRENT_VERSION_FLAG "-current_version ") +set (CMAKE_CXX_OSX_COMPATIBILITY_VERSION_FLAG "${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}") +set (CMAKE_CXX_OSX_CURRENT_VERSION_FLAG "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}") + +# Hidden visibilty is required for cxx on iOS +set (CMAKE_C_FLAGS "") +set (CMAKE_CXX_FLAGS "-headerpad_max_install_names -fvisibility=hidden -fvisibility-inlines-hidden") + +set (CMAKE_C_LINK_FLAGS "-Wl,-search_paths_first ${CMAKE_C_LINK_FLAGS}") +set (CMAKE_CXX_LINK_FLAGS "-Wl,-search_paths_first ${CMAKE_CXX_LINK_FLAGS}") + +set (CMAKE_PLATFORM_HAS_INSTALLNAME 1) +set (CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-dynamiclib -headerpad_max_install_names") +set (CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names") +set (CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") +set (CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") +set (CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a") + +# hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree +# (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache +# and still cmake didn't fail in CMakeFindBinUtils.cmake (because it isn't rerun) +# hardcode CMAKE_INSTALL_NAME_TOOL here to install_name_tool, so it behaves as it did before, Alex +if (NOT DEFINED CMAKE_INSTALL_NAME_TOOL) + find_program(CMAKE_INSTALL_NAME_TOOL install_name_tool) +endif (NOT DEFINED CMAKE_INSTALL_NAME_TOOL) + +# Setup iOS platform +if (NOT DEFINED IOS_PLATFORM) + set (IOS_PLATFORM "OS") +endif (NOT DEFINED IOS_PLATFORM) +set (IOS_PLATFORM ${IOS_PLATFORM} CACHE STRING "Type of iOS Platform") + +# Check the platform selection and setup for developer root +if (${IOS_PLATFORM} STREQUAL "OS") + set (IOS_PLATFORM_LOCATION "iPhoneOS.platform") +elseif (${IOS_PLATFORM} STREQUAL "SIMULATOR") + set (IOS_PLATFORM_LOCATION "iPhoneSimulator.platform") +else (${IOS_PLATFORM} STREQUAL "OS") + message (FATAL_ERROR "Unsupported IOS_PLATFORM value selected. Please choose OS or SIMULATOR") +endif (${IOS_PLATFORM} STREQUAL "OS") + +# Setup iOS developer location +if (NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT) + set (CMAKE_IOS_DEVELOPER_ROOT "/Developer/Platforms/${IOS_PLATFORM_LOCATION}/Developer") +endif (NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT) +set (CMAKE_IOS_DEVELOPER_ROOT ${CMAKE_IOS_DEVELOPER_ROOT} CACHE PATH "Location of iOS Platform") + +# Find and use the most recent iOS sdk +if (NOT DEFINED CMAKE_IOS_SDK_ROOT) + file (GLOB _CMAKE_IOS_SDKS "${CMAKE_IOS_DEVELOPER_ROOT}/SDKs/*") + if (_CMAKE_IOS_SDKS) + list (SORT _CMAKE_IOS_SDKS) + list (REVERSE _CMAKE_IOS_SDKS) + list (GET _CMAKE_IOS_SDKS 0 CMAKE_IOS_SDK_ROOT) + else (_CMAKE_IOS_SDKS) + message (FATAL_ERROR "No iOS SDK's found in default seach path ${CMAKE_IOS_DEVELOPER_ROOT}. Manually set CMAKE_IOS_SDK_ROOT or install the iOS SDK.") + endif (_CMAKE_IOS_SDKS) + message (STATUS "Toolchain using default iOS SDK: ${CMAKE_IOS_SDK_ROOT}") +endif (NOT DEFINED CMAKE_IOS_SDK_ROOT) +set (CMAKE_IOS_SDK_ROOT ${CMAKE_IOS_SDK_ROOT} CACHE PATH "Location of the selected iOS SDK") + +# Set the sysroot default to the most recent SDK +set (CMAKE_OSX_SYSROOT ${CMAKE_IOS_SDK_ROOT} CACHE PATH "Sysroot used for iOS support") + +# set the architecture for iOS - using ARCHS_STANDARD_32_BIT sets armv6,armv7 and appears to be XCode's standard. +# The other value that works is ARCHS_UNIVERSAL_IPHONE_OS but that sets armv7 only +set (CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD_64_BIT)" CACHE string "Build architecture for iOS") + +# Set the find root to the iOS developer roots and to user defined paths +set (CMAKE_FIND_ROOT_PATH ${CMAKE_IOS_DEVELOPER_ROOT} ${CMAKE_IOS_SDK_ROOT} ${CMAKE_PREFIX_PATH} CACHE string "iOS find search path root") + +# default to searching for frameworks first +set (CMAKE_FIND_FRAMEWORK FIRST) + +# set up the default search directories for frameworks +set (CMAKE_SYSTEM_FRAMEWORK_PATH + ${CMAKE_IOS_SDK_ROOT}/System/Library/Frameworks + ${CMAKE_IOS_SDK_ROOT}/System/Library/PrivateFrameworks + ${CMAKE_IOS_SDK_ROOT}/Developer/Library/Frameworks +) + +# only search the iOS sdks, not the remainder of the host filesystem +set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) +set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) diff --git a/cmake/toolchain.cmake b/cmake/toolchainchooser.cmake similarity index 100% rename from cmake/toolchain.cmake rename to cmake/toolchainchooser.cmake diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1c0ec386..a8f4e3c4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,20 +2,29 @@ include (${CMAKE_SOURCE_DIR}/cmake/function.cmake) set ( SUBLIBRARY_NAME QQt) -set( VER_FILEVERSION 0,1,0,0 )//文件版本 -set( VER_FILEVERSION_STR "0.1.0.0" ) -set( VER_PRODUCTVERSION 0,1,0,0 ) -set( VER_PRODUCTVERSION_STR "0.1" )//产品版本 -set( VER_COMPANYNAME_STR "QQT" ) -set( VER_FILEDESCRIPTION_STR "QQT" )//文件说明 +#文件版本 +set( VER_FILEVERSION 1,0,0,0 ) +set( VER_FILEVERSION_STR "1.0.0.0" ) + +#产品版本 +set( VER_PRODUCTVERSION 1.0 ) +set( VER_PRODUCTVERSION_MAJOR 1 ) +set( VER_PRODUCTVERSION_STR "1.0" ) +set( VER_PRODUCTVERSION_MAJOR_STR "1" ) + +#产品名称 +set( VER_PRODUCTNAME_STR "QQT" ) +set( VER_ORIGINALFILENAME_STR "QQT" ) set( VER_INTERNALNAME_STR "QQT" ) -set( VER_LEGALCOPYRIGHT_STR "Copyright 2007-2017 QQT Co., Ltd." ) //版权 -set( VER_LEGALTRADEMARKS1_STR "All rights reserved" ) -set( VER_LEGALTRADEMARKS2_STR VER_LEGALTRADEMARKS1_STR ) -set( VER_ORIGINALFILENAME_STR "QQT" )//原始文件名 -set( VER_PRODUCTNAME_STR "QQT" )//产品名称 +set( VER_COMPANYNAME_STR "QQT" ) set( VER_COMPANYDOMAIN_STR "www.qqt.com" ) -configure_file(qqtversion.h.in core/qqtversion.h) +#文件说明 +set( VER_FILEDESCRIPTION_STR "QQT" ) +#版权 +set( VER_LEGALCOPYRIGHT_STR "Copyright 2007-2017 QQT Co., Ltd." ) +set( VER_LEGALTRADEMARKS1_STR "All rights reserved" ) +set( VER_LEGALTRADEMARKS2_STR ${VER_LEGALTRADEMARKS1_STR} ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qqtversion.h.in ${CMAKE_CURRENT_SOURCE_DIR}/core/qqtversion.h) ##SOURCES file(GLOB_RECURSE SOURCES "*.cpp") @@ -26,14 +35,13 @@ if(UNIX) set(SOURCE ${SOURCES} ${DMMUSOURCES}) endif(UNIX) -if(NOT UNIX) +if(APPLE OR WIN32 OR WINCE) file(GLOB FILTER "network/qqtethenetmanager.cpp") set(FILTERS ${FILTERS} ${FILTER}) file(GLOB FILTER "frame/qqtpreviewwidget.cpp") set(FILTERS ${FILTERS} ${FILTER}) file(GLOB FILTER "frame/qqtwifiwidget.cpp") set(FILTERS ${FILTERS} ${FILTER}) - msglist("${FILTERS}") filter_out("${FILTERS}" "${SOURCES}" SOURCES ) endif() @@ -52,7 +60,7 @@ elseif(UNIX) endif(WIN32) #内部编译 解决头文件发现不了的问题 -include_directories( core sql network +include_directories( core sql network customplot gui widgets frame pluginwatcher printsupport ) @@ -61,21 +69,25 @@ SET_TARGET_PROPERTIES(${SUBLIBRARY_NAME} PROPERTIES OUTPUT_NAME ${SUBLIBRARY_NAM GET_TARGET_PROPERTY(OUTPUT_VALUE ${SUBLIBRARY_NAME} OUTPUT_NAME) MESSAGE(STATUS "${OUTPUT_VALUE} ${CMAKE_SHARED_LIBS}") -SET_TARGET_PROPERTIES(${SUBLIBRARY_NAME} PROPERTIES VERSION 1.2 SOVERSION 1) +SET_TARGET_PROPERTIES(${SUBLIBRARY_NAME} PROPERTIES VERSION ${VER_PRODUCTVERSION} SOVERSION ${VER_PRODUCTVERSION_MAJOR}) -set(Qt5Libs Core Widgets Gui Xml Sql Network PrintSupport SerialPort) -foreach(loop_var ${Qt5Libs}) - #message(Qt5${loop_var}) - find_package(Qt5${loop_var}) - target_link_libraries(${SUBLIBRARY_NAME} Qt5::${loop_var}) -endforeach(loop_var) +link_qt_libraries(${SUBLIBRARY_NAME}) -install(TARGETS ${SUBLIBRARY_NAME} +if(APPLE) + link_framework(${SUBLIBRARY_NAME}) + set_target_properties(${SUBLIBRARY_NAME} PROPERTIES AUTOMOC_MOC_OPTIONS "-DQ_OS_MAC") + # qmake will do this automatically + set_target_properties(${SUBLIBRARY_NAME} PROPERTIES COMPILE_FLAGS "-mmacosx-version-min=10.10") +endif() + + + +install(TARGETS ${SUBLIBRARY_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) install ( FILES ${MOC_HEADERS} - DESTINATION include + DESTINATION include ) diff --git a/src/core/qqtversion.h b/src/core/qqtversion.h index e338c7a3..68734305 100644 --- a/src/core/qqtversion.h +++ b/src/core/qqtversion.h @@ -1,20 +1,22 @@ #ifndef QQTVERSION_H #define QQTVERSION_H -#define VER_FILEVERSION 0,1,0,0 //鏂囦欢鐗堟湰 -#define VER_FILEVERSION_STR "0.1.0.0" +#define VER_FILEVERSION 1,0,0,0 //文件版本 +#define VER_FILEVERSION_STR "1.0.0.0" -#define VER_PRODUCTVERSION 0,1,0,0 -#define VER_PRODUCTVERSION_STR "0.1" //浜у搧鐗堟湰 +#define VER_PRODUCTVERSION 1.0 //产品版本 +#define VER_PRODUCTVERSION_MAJOR 1 +#define VER_PRODUCTVERSION_STR "1.0" //产品版本 +#define VER_PRODUCTVERSION_MAJOR_STR "1" #define VER_COMPANYNAME_STR "QQT" -#define VER_FILEDESCRIPTION_STR "QQT" //鏂囦欢璇存槑 +#define VER_FILEDESCRIPTION_STR "QQT" //文件说明 #define VER_INTERNALNAME_STR "QQT" -#define VER_LEGALCOPYRIGHT_STR "Copyright 2007-2017 QQT Co., Ltd." //鐗堟潈 +#define VER_LEGALCOPYRIGHT_STR "Copyright 2007-2017 QQT Co., Ltd." //版权 #define VER_LEGALTRADEMARKS1_STR "All rights reserved" -#define VER_LEGALTRADEMARKS2_STR VER_LEGALTRADEMARKS1_STR -#define VER_ORIGINALFILENAME_STR "QQT" //鍘熷鏂囦欢鍚 -#define VER_PRODUCTNAME_STR "QQT" //浜у搧鍚嶇О +#define VER_LEGALTRADEMARKS2_STR "All rights reserved" +#define VER_ORIGINALFILENAME_STR "QQT" //原始文件名 +#define VER_PRODUCTNAME_STR "QQT" //产品名称 #define VER_COMPANYDOMAIN_STR "www.qqt.com" diff --git a/src/network/qqtclient.cpp b/src/network/qqtclient.cpp index f31ff4d3..42c3a997 100644 --- a/src/network/qqtclient.cpp +++ b/src/network/qqtclient.cpp @@ -3,8 +3,10 @@ #if defined(__WIN__) || defined(__WIN64__) #include "qqtwin.h" -#else +#elif defined(__LINUX__) || defined(__LINUX64__) #include "qqtlinux.h" +#else +#include "qqtdarwin.h" #endif #include diff --git a/src/qqt.h b/src/qqt.h index a9e7a94a..2374795c 100644 --- a/src/qqt.h +++ b/src/qqt.h @@ -5,8 +5,10 @@ #include "qqtgui-qt.h" #if defined(__WIN__) || defined(__WIN64__) #include "qqtwin.h" -#else +#elif defined(__LINUX__) || defined(__LINUX64__) #include "qqtlinux.h" +#else +#include "qqtdarwin.h" #endif #include "qqtcore.h" #include "qqtsql.h" diff --git a/src/qqtdarwin.h b/src/qqtdarwin.h new file mode 100644 index 00000000..0f3ad811 --- /dev/null +++ b/src/qqtdarwin.h @@ -0,0 +1,36 @@ +#ifndef QQTDARWIN_H +#define QQTDARWIN_H + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef __cplusplus +} +#endif /* __cplusplus */ +#endif // QQTDARWIN_H diff --git a/src/qqtversion.h.in b/src/qqtversion.h.in index fabe9b71..46432bd0 100644 --- a/src/qqtversion.h.in +++ b/src/qqtversion.h.in @@ -2,20 +2,22 @@ #define QQTVERSION_H #define VER_FILEVERSION ${VER_FILEVERSION} //文件版本 -#define VER_FILEVERSION_STR ${VER_FILEVERSION_STR} +#define VER_FILEVERSION_STR "${VER_FILEVERSION_STR}" -#define VER_PRODUCTVERSION ${VER_PRODUCTVERSION} -#define VER_PRODUCTVERSION_STR ${VER_PRODUCTVERSION_STR} //产品版本 +#define VER_PRODUCTVERSION ${VER_PRODUCTVERSION} //产品版本 +#define VER_PRODUCTVERSION_MAJOR ${VER_PRODUCTVERSION_MAJOR} +#define VER_PRODUCTVERSION_STR "${VER_PRODUCTVERSION_STR}" //产品版本 +#define VER_PRODUCTVERSION_MAJOR_STR "${VER_PRODUCTVERSION_MAJOR_STR}" -#define VER_COMPANYNAME_STR ${VER_COMPANYNAME_STR} -#define VER_FILEDESCRIPTION_STR ${VER_FILEDESCRIPTION_STR} //文件说明 -#define VER_INTERNALNAME_STR ${VER_INTERNALNAME_STR} -#define VER_LEGALCOPYRIGHT_STR ${VER_LEGALCOPYRIGHT_STR} //版权 -#define VER_LEGALTRADEMARKS1_STR ${VER_LEGALTRADEMARKS1_STR} -#define VER_LEGALTRADEMARKS2_STR VER_LEGALTRADEMARKS1_STR -#define VER_ORIGINALFILENAME_STR ${VER_ORIGINALFILENAME_STR} //原始文件名 -#define VER_PRODUCTNAME_STR ${VER_PRODUCTNAME_STR} //产品名称 +#define VER_COMPANYNAME_STR "${VER_COMPANYNAME_STR}" +#define VER_FILEDESCRIPTION_STR "${VER_FILEDESCRIPTION_STR}" //文件说明 +#define VER_INTERNALNAME_STR "${VER_INTERNALNAME_STR}" +#define VER_LEGALCOPYRIGHT_STR "${VER_LEGALCOPYRIGHT_STR}" //版权 +#define VER_LEGALTRADEMARKS1_STR "${VER_LEGALTRADEMARKS1_STR}" +#define VER_LEGALTRADEMARKS2_STR "${VER_LEGALTRADEMARKS2_STR}" +#define VER_ORIGINALFILENAME_STR "${VER_ORIGINALFILENAME_STR}" //原始文件名 +#define VER_PRODUCTNAME_STR "${VER_PRODUCTNAME_STR}" //产品名称 -#define VER_COMPANYDOMAIN_STR ${VER_COMPANYDOMAIN_STR} +#define VER_COMPANYDOMAIN_STR "${VER_COMPANYDOMAIN_STR}" #endif // QQTVERSION_H