From: <mie...@us...> - 2013-12-15 22:09:51
|
Revision: 9715 http://sourceforge.net/p/oorexx/code-0/9715 Author: miesfeld Date: 2013-12-15 22:09:47 +0000 (Sun, 15 Dec 2013) Log Message: ----------- Fix up the ooDialog build so it can work with a Win SDK version 6.1 Modified Paths: -------------- main/branches/4.2.0/trunk/extensions/platform/windows/oodialog/oodShellObjects.cpp main/branches/4.2.0/trunk/extensions/platform/windows/oodialog/oodialog.mak Modified: main/branches/4.2.0/trunk/extensions/platform/windows/oodialog/oodShellObjects.cpp =================================================================== --- main/branches/4.2.0/trunk/extensions/platform/windows/oodialog/oodShellObjects.cpp 2013-12-15 17:17:16 UTC (rev 9714) +++ main/branches/4.2.0/trunk/extensions/platform/windows/oodialog/oodShellObjects.cpp 2013-12-15 22:09:47 UTC (rev 9715) @@ -50,6 +50,14 @@ #include "oodShared.hpp" #include "oodShellObjects.hpp" +/* Allow compiling with the Windows SDK version 6.1. To compile with a 6.1 + * Windows SDK set OODIALOG_WINSDK_6_1=1 in the environment and the make file + * will do the proper thing. + */ +#ifdef OODIALOG_WINSDK_6_1 +typedef DWORD FILEOPENDIALOGOPTIONS; +#define CDCS_ENABLEDVISIBLE 0x3 +#endif /** * General purpose stuff for working with the Shell. Modified: main/branches/4.2.0/trunk/extensions/platform/windows/oodialog/oodialog.mak =================================================================== --- main/branches/4.2.0/trunk/extensions/platform/windows/oodialog/oodialog.mak 2013-12-15 17:17:16 UTC (rev 9714) +++ main/branches/4.2.0/trunk/extensions/platform/windows/oodialog/oodialog.mak 2013-12-15 22:09:47 UTC (rev 9715) @@ -78,6 +78,11 @@ ood_ver_strings = $(copy_year_str) $(ver_str) ood_ver_def = -DOOD_VER=$(OOD_MAJOR) -DOOD_REL=$(OOD_MINOR) -DOOD_MOD=$(OOD_MOD_LVL) -DOOD_BLD=$(OOD_BLD_LVL) $(ood_ver_strings) +!ifdef OODIALOG_WINSDK_6_1 +!message OODIALOG_WINSDK_6_1 $(OODIALOG_WINSDK_6_1) +cflags_common = $(cflags_common) -DOODIALOG_WINSDK_6_1 +!endif + # We use our own rc flags version. rcflags_oodialog = rc /DWIN32 -dOODIALOG_VER=$(OOD_MAJOR) -dOODIALOG_REL=$(OOD_MINOR) -dOODIALOG_SUB=$(OOD_MOD_LVL) -dOODIALOG_BLD=$(OOD_BLD_LVL) -dOODIALOG_VER_STR=\"$(OOD_VER_STR)\" -dOODIALOG_COPY_YEAR=\"$(OOD_COPY_YEAR)\" -dMANIFEST_FILE=$(M_FILE) |