diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-11-24 21:23:41 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-11-24 21:23:41 +0100 |
| commit | 91ad155c7e7383c2d38bdbda4659a365ce268606 (patch) | |
| tree | daff1c6d90ef188f516fefc3d104c7aeaba40947 /packaging | |
| parent | 20f94499fa5b665cca4024ddd649d01fedea798d (diff) | |
| download | mariadb-git-91ad155c7e7383c2d38bdbda4659a365ce268606.tar.gz | |
Bug #58411 :wixca project fails to build when using Express Edition of VS:
The problem was MFC header file includes into the resource definition file (CustomAction.rc)
afxres.h is not available with VS Express.
The fix is to remove resource file from compilation and souce code repository. version of
custom action dll is of no interest for anyone, it is internal dll kept inside the MSI.
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/WiX/ca/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/WiX/ca/CustomAction.rc | 18 |
2 files changed, 1 insertions, 19 deletions
diff --git a/packaging/WiX/ca/CMakeLists.txt b/packaging/WiX/ca/CMakeLists.txt index c74b51284c7..a03ceb9a5d2 100644 --- a/packaging/WiX/ca/CMakeLists.txt +++ b/packaging/WiX/ca/CMakeLists.txt @@ -16,7 +16,7 @@ INCLUDE_DIRECTORIES(${WIX_DIR}/../SDK/inc) LINK_DIRECTORIES(${WIX_DIR}/../SDK/lib) -SET(WIXCA_SOURCES CustomAction.cpp CustomAction.rc CustomAction.def) +SET(WIXCA_SOURCES CustomAction.cpp CustomAction.def) IF(CMAKE_SIZEOF_VOID_P EQUAL 8) LINK_LIBRARIES(wcautil_x64 dutil_x64 msi version) diff --git a/packaging/WiX/ca/CustomAction.rc b/packaging/WiX/ca/CustomAction.rc deleted file mode 100644 index 3f37126ee77..00000000000 --- a/packaging/WiX/ca/CustomAction.rc +++ /dev/null @@ -1,18 +0,0 @@ -#include "afxres.h" -#undef APSTUDIO_READONLY_SYMBOLS - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 - FILEFLAGSMASK 0x17L -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x0L - FILESUBTYPE 0x0L -BEGIN -END - |