Changeset 3372 in vbox for trunk/src/libs/xpcom18a4/xpcom

Timestamp:

Jul 3, 2007 1:05:50 AM (18 years ago)

Author:

vboxsync

Message:

XPCOM: Executable and DLL names may be specified from makefiles, for consistency.

Location:

trunk/src/libs/xpcom18a4/xpcom

Files:

• base/nsDebugImpl.cpp (modified) (2 diffs)
• build/nsXPCOMPrivate.h (modified) (3 diffs)

trunk/src/libs/xpcom18a4/xpcom/base/nsDebugImpl.cpp

@@ -38 +38 @@
  * ***** END LICENSE BLOCK ***** */
 
+#include "nsXPCOMPrivate.h"
 #include "nsDebugImpl.h"
 #include "nsDebug.h"
@@ -227 +228 @@
       si.wShowWindow = SW_SHOW;
 
-      if(GetModuleFileName(GetModuleHandle("xpcom.dll"), executable, MAX_PATH) &&
+      if(GetModuleFileName(GetModuleHandle(XPCOM_DLL), executable, MAX_PATH) &&
          NULL != (pName = strrchr(executable, '\\')) &&
          NULL != strcpy(pName+1, "windbgdlg.exe") &&

trunk/src/libs/xpcom18a4/xpcom/build/nsXPCOMPrivate.h

@@ -168 +168 @@
  */
 
+#ifdef XPCOM_DLL_BASE
+#define XPCOM_DLL         XPCOM_DLL_BASE MOZ_DLL_SUFFIX
+#endif
+
 #if defined(XP_WIN32) || defined(XP_OS2)
 
@@ -173 +177 @@
 #define GRE_CONF_NAME     "gre.config"
 #define GRE_WIN_REG_LOC   "Software\\mozilla.org\\GRE\\"
-#define XPCOM_DLL         "xpcom.dll"
+#ifndef XPCOM_DLL
+#define XPCOM_DLL         "xpcom"MOZ_DLL_SUFFIX
+#endif
 
 #elif defined(XP_BEOS)
@@ -180 +186 @@
 #define GRE_CONF_NAME ".gre.config"
 #define GRE_CONF_PATH "/boot/home/config/settings/GRE/gre.conf"
+#ifndef XPCOM_DLL
 #define XPCOM_DLL "libxpcom"MOZ_DLL_SUFFIX
+#endif
 
 #else // Unix
 
-#define XPCOM_DLL "VBoxXPCOM"MOZ_DLL_SUFFIX
+#ifndef XPCOM_DLL
+#define XPCOM_DLL "libxpcom"MOZ_DLL_SUFFIX
+#endif
 
 // you have to love apple..