Thu Nov 22 13:47:54 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

9 files changed, 22 insertions, 10 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 53e656eb61f..bbe51ce89e6 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,15 @@
+Thu Nov 22 13:47:54 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/ace_for_tao.mpc:
+        * ace/QoS/qos.mpc:
+        * bin/MakeProjectCreator/config/ace_fl.mpb:
+        * bin/MakeProjectCreator/config/ace_gl.mpb:
+        * bin/MakeProjectCreator/config/ace_qt.mpb:
+        * bin/MakeProjectCreator/config/ace_x11.mpb:
+        * bin/MakeProjectCreator/config/acedefaults.mpb:
+        * bin/MakeProjectCreator/config/ipv6.mpb:
+          Added support for vc9
+
 Thu Nov 22 12:44:54 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/Vector_T.inl:
diff --git a/ACE/ace/QoS/qos.mpc b/ACE/ace/QoS/qos.mpc
index ebd482517f6..2714a735bf6 100644
--- a/ACE/ace/QoS/qos.mpc
+++ b/ACE/ace/QoS/qos.mpc
@@ -7,7 +7,7 @@ project(QoS) : acelib, install {
   dynamicflags = ACE_QoS_BUILD_DLL
   macros      += ACE_HAS_QOS
 
-  specific(borland, bmake, nmake, em3, vc6, vc7, vc71, vc8) {
+  specific(borland, bmake, nmake, em3, vc6, vc7, vc71, vc8, vc9) {
     macros += ACE_HAS_WINSOCK2_GQOS
   }
 
diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc
index 963643a46e2..2d8bd62faf3 100644
--- a/ACE/ace/ace_for_tao.mpc
+++ b/ACE/ace/ace_for_tao.mpc
@@ -188,7 +188,7 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
     }
 
     // ACE_Token implementation uses semaphores on Windows and VxWorks.
-    conditional(vc6,vc71,vc8,nmake,bmake,borland) {
+    conditional(vc6,vc71,vc8,vc9,nmake,bmake,borland) {
       NT_Service.cpp // Required by ace_for_tao sponsors
       Semaphore.cpp
       Process_Mutex.cpp
diff --git a/ACE/bin/MakeProjectCreator/config/ace_fl.mpb b/ACE/bin/MakeProjectCreator/config/ace_fl.mpb
index 315e3f9499e..fd7f56695aa 100644
--- a/ACE/bin/MakeProjectCreator/config/ace_fl.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ace_fl.mpb
@@ -6,13 +6,13 @@ project : ace_x11, ace_gl {
 
   // Depends on configuration from include/makeinclude/platform_*.GNU
   verbatim(gnuace,local) {
-    CPPFLAGS += $(PLATFORM_FL_CPPFLAGS) 
+    CPPFLAGS += $(PLATFORM_FL_CPPFLAGS)
     CPPFLAGS += $(PLATFORM_GL_CPPFLAGS) $(PLATFORM_X11_CPPFLAGS)
     LIBS += $(PLATFORM_FL_LIBS) $(PLATFORM_GL_LIBS) $(PLATFORM_X11_LIBS)
-    LDFLAGS += $(PLATFORM_FL_LDFLAGS) $(PLATFORM_GL_LDFLAGS) 
+    LDFLAGS += $(PLATFORM_FL_LDFLAGS) $(PLATFORM_GL_LDFLAGS)
     LDFLAGS += $(PLATFORM_GL_LDFLAGS)
   }
-  specific(vc8,vc71,vc7,vc6) {
+  specific(vc9,vc8,vc71,vc7,vc6) {
      libs += fltkdll
   }
 
diff --git a/ACE/bin/MakeProjectCreator/config/ace_gl.mpb b/ACE/bin/MakeProjectCreator/config/ace_gl.mpb
index 69bccb163af..645fd0104aa 100644
--- a/ACE/bin/MakeProjectCreator/config/ace_gl.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ace_gl.mpb
@@ -10,7 +10,7 @@ project : ace_x11 {
     LIBS += $(PLATFORM_GL_LIBS) $(PLATFORM_X11_LIBS)
     LDFLAGS += $(PLATFORM_GL_LDFLAGS) $(PLATFORM_GL_LDFLAGS)
   }
-  specific(vc6,vc7,vc71,vc8) {
+  specific(vc6,vc7,vc71,vc8,vc9) {
     lit_libs += OpenGL32
   }
 }
diff --git a/ACE/bin/MakeProjectCreator/config/ace_qt.mpb b/ACE/bin/MakeProjectCreator/config/ace_qt.mpb
index 5b66aa7f68f..3c8635caaf2 100644
--- a/ACE/bin/MakeProjectCreator/config/ace_qt.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ace_qt.mpb
@@ -21,7 +21,7 @@ project: qt {
     pure_libs += $(ACE_QT_LIBS)
   }
 
-  specific(vc6, vc7, vc71, vc8, nmake) {
+  specific(vc6, vc7, vc71, vc8, vc9, nmake) {
     lit_libs -= qt-mt$(QT_VERSION)
     pure_libs += $(PLATFORM_QT_LIBS)
   }
diff --git a/ACE/bin/MakeProjectCreator/config/ace_x11.mpb b/ACE/bin/MakeProjectCreator/config/ace_x11.mpb
index 0b2f478acc2..38164eb093f 100644
--- a/ACE/bin/MakeProjectCreator/config/ace_x11.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ace_x11.mpb
@@ -2,7 +2,7 @@
 // $Id$
 
 project {
-  specific(vc6,vc7,vc71,vc8) {
+  specific(vc6,vc7,vc71,vc8,vc9) {
   } else {
     requires += x11
   }
diff --git a/ACE/bin/MakeProjectCreator/config/acedefaults.mpb b/ACE/bin/MakeProjectCreator/config/acedefaults.mpb
index e7d14465290..1bce4d42799 100644
--- a/ACE/bin/MakeProjectCreator/config/acedefaults.mpb
+++ b/ACE/bin/MakeProjectCreator/config/acedefaults.mpb
@@ -19,7 +19,7 @@ project: ipv6, vc8_warnings {
     libpaths -= $(ACE_ROOT)/lib
   }
 
-  specific(vc8) {
+  specific(vc8,vc9) {
     // Enable structured exception handling
     ExceptionHandling = 2
   }
diff --git a/ACE/bin/MakeProjectCreator/config/ipv6.mpb b/ACE/bin/MakeProjectCreator/config/ipv6.mpb
index 60ceabf96f0..291cee4960b 100644
--- a/ACE/bin/MakeProjectCreator/config/ipv6.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ipv6.mpb
@@ -2,7 +2,7 @@
 // $Id$
 
 feature(ipv6) {
-  specific(vc6, vc7, vc71, vc8, nmake, borland, bmake, bds4) {
+  specific(vc6, vc7, vc71, vc8, vc9, nmake, borland, bmake, bds4) {
     lit_libs += iphlpapi
   }