Changeset 20398

Timestamp:

06/30/07 07:11:16 (1 year ago)

Author:

patrick

Message:

When looking up the Draw Manager DLL to get the icon for the window, factor
in that the DLL is versioned.

Files:

• juggler/trunk/modules/vrjuggler/vrj/Draw/Direct3D/D3dWindow.cpp (modified) (2 diffs)
• juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlWindowWin32.cpp (modified) (2 diffs)

juggler/trunk/modules/vrjuggler/vrj/Draw/Direct3D/D3dWindow.cpp

@@ -41 +41 @@
-#include <vrj/Draw/Direct3D/D3dSimInterface.h>
-
+// The following is used below in D3dWindow::registerWindowClass(). The key
+// parts are VJ_LIB_RT_OPT and VJ_VERSION_STR.
+#  if defined(VJ_DEBUG)
+#     if defined(_DEBUG)
+#        define VJ_LIB_RT_OPT "_d"
+#     else
+#        define VJ_LIB_RT_OPT "_g"
+#     endif
+#  else
+#     define VJ_LIB_RT_OPT ""
+#  endif
+
+#  define VJ_STRINGIZE(X) VJ_DO_STRINGIZE(X)
+#  define VJ_DO_STRINGIZE(X) #X
+#  define VJ_VERSION_STR VJ_STRINGIZE(__VJ_MAJOR__) "_" \
+                         VJ_STRINGIZE(__VJ_MINOR__) "_" \
+                         VJ_STRINGIZE(__VJ_PATCH__)
+
-// This variable determines which matrix stack we put the viewing transformation
-// If it is on the proj matrix, then lighting and env maps work but fog breaks.
@@ -478 +496 @@
-   mWinClass.lpszClassName  = D3D_WINDOW_WIN32_CLASSNAME;
-
-#if defined(VJ_DEBUG)
-#  if defined(_DEBUG)
-#     define LIBNAME "vrj_d3d_d.dll"
-#  else
-#     define LIBNAME "vrj_d3d_g.dll"
-#  endif
-#else
-#  define LIBNAME "vrj_d3d.dll"
-#endif
-
-   if (mWinClass.hIcon == NULL)
-   {
-
+
+
-      if (hDLLInstance != NULL)
-      {

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlWindowWin32.cpp

@@ -41 +41 @@
-#include <vrj/Draw/OGL/GlWindow.h>
-#include <vrj/Draw/OGL/GlWindowWin32.h>
+
+// The following is used below in GlWindowWin32::registerWindowClass(). The
+// key parts are VJ_LIB_RT_OPT and VJ_VERSION_STR.
+#  if defined(VJ_DEBUG)
+#     if defined(_DEBUG)
+#        define VJ_LIB_RT_OPT "_d"
+#     else
+#        define VJ_LIB_RT_OPT "_g"
+#     endif
+#  else
+#     define VJ_LIB_RT_OPT ""
+#  endif
+
+#  define VJ_STRINGIZE(X) VJ_DO_STRINGIZE(X)
+#  define VJ_DO_STRINGIZE(X) #X
+#  define VJ_VERSION_STR VJ_STRINGIZE(__VJ_MAJOR__) "_" \
+                         VJ_STRINGIZE(__VJ_MINOR__) "_" \
+                         VJ_STRINGIZE(__VJ_PATCH__)
+
-
-static const char* GL_WINDOW_WIN32_CLASSNAME("vrj::GlWindowWin32");
@@ -722 +741 @@
-   mWinClass.lpszClassName  = GL_WINDOW_WIN32_CLASSNAME;
-
-#if defined(VJ_DEBUG)
-#  if defined(_DEBUG)
-#     define LIBNAME "vrj_ogl_d.dll"
-#  else
-#     define LIBNAME "vrj_ogl_g.dll"
-#  endif
-#else
-#  define LIBNAME "vrj_ogl.dll"
-#endif
-
-   if (mWinClass.hIcon == NULL)
-   {
-
+
+
-      if (hDLLInstance != NULL)
-      {