[Oorexx-svn] SF.net SVN: oorexx-code-0:[9716] ooDialog

[<mie...@us...>]

Revision: 9716
          http://sourceforge.net/p/oorexx/code-0/9716
Author:   miesfeld
Date:     2013-12-15 22:10:22 +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:
--------------
    ooDialog/branches/4.2.3/trunk/ooDialog/oodShellObjects.cpp
    ooDialog/branches/4.2.3/trunk/ooDialog/oodialog.mak
    ooDialog/trunk/ooDialog/oodShellObjects.cpp
    ooDialog/trunk/ooDialog/oodialog.mak

Modified: ooDialog/branches/4.2.3/trunk/ooDialog/oodShellObjects.cpp
===================================================================
--- ooDialog/branches/4.2.3/trunk/ooDialog/oodShellObjects.cpp	2013-12-15 22:09:47 UTC (rev 9715)
+++ ooDialog/branches/4.2.3/trunk/ooDialog/oodShellObjects.cpp	2013-12-15 22:10:22 UTC (rev 9716)
@@ -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: ooDialog/branches/4.2.3/trunk/ooDialog/oodialog.mak
===================================================================
--- ooDialog/branches/4.2.3/trunk/ooDialog/oodialog.mak	2013-12-15 22:09:47 UTC (rev 9715)
+++ ooDialog/branches/4.2.3/trunk/ooDialog/oodialog.mak	2013-12-15 22:10:22 UTC (rev 9716)
@@ -55,6 +55,15 @@
 
 REXXAPI_LIBS = $(REXX_LIBS)
 
+# Generate the version information.  Quit if there is an error.  We only do this
+# when we are building outside of the interpreter build.  Within the interpreter
+# build, the ooDialog source will be the latest released version of ooDialog.
+# That released version will have a static ooDialog.ver.incl file that reflects
+# the exact version at the time of release.
+!IF [generateVersionFile.bat] != 0
+!  ERROR Build error: could not gerate version file, ooDialog.ver.incl
+!ENDIF
+
 !else
 
 OOD_OUTDIR=$(OR_OUTDIR)
@@ -64,11 +73,6 @@
 
 !endif
 
-# Generate the version information.  Quit if there is an error.
-!IF [generateVersionFile.bat] != 0
-!  ERROR Build error: could not gerate version file, ooDialog.ver.incl
-!ENDIF
-
 !include ooDialog.ver.incl
 !include $(OOD_INCLUDE_FILE)
 
@@ -78,6 +82,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 $(RC_NOLOGO) /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)
 

Modified: ooDialog/trunk/ooDialog/oodShellObjects.cpp
===================================================================
--- ooDialog/trunk/ooDialog/oodShellObjects.cpp	2013-12-15 22:09:47 UTC (rev 9715)
+++ ooDialog/trunk/ooDialog/oodShellObjects.cpp	2013-12-15 22:10:22 UTC (rev 9716)
@@ -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: ooDialog/trunk/ooDialog/oodialog.mak
===================================================================
--- ooDialog/trunk/ooDialog/oodialog.mak	2013-12-15 22:09:47 UTC (rev 9715)
+++ ooDialog/trunk/ooDialog/oodialog.mak	2013-12-15 22:10:22 UTC (rev 9716)
@@ -82,6 +82,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 $(RC_NOLOGO) /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)