--- a/apisupport.harness/release/run.xml Wed Jan 11 14:23:31 2012 +0100
+++ a/apisupport.harness/release/run.xml Fri Jan 13 15:13:55 2012 -0500
@@ -147,9 +147,12 @@
+
+
+
-
+
--- a/ide/launcher/windows/nblauncher.cpp Wed Jan 11 14:23:31 2012 +0100
+++ a/ide/launcher/windows/nblauncher.cpp Fri Jan 13 15:13:55 2012 -0500
@@ -51,7 +51,11 @@
using namespace std;
+#if defined(_WIN64) || defined(WIN64) || defined(__MINGW64__)
+const char *NbLauncher::NBEXEC_FILE_PATH = "\\lib\\nbexec64.dll";
+#else
const char *NbLauncher::NBEXEC_FILE_PATH = "\\lib\\nbexec.dll";
+#endif
const char *NbLauncher::OPT_NB_DEFAULT_USER_DIR = "netbeans_default_userdir=";
const char *NbLauncher::OPT_NB_DEFAULT_OPTIONS = "netbeans_default_options=";
const char *NbLauncher::OPT_NB_EXTRA_CLUSTERS = "netbeans_extraclusters=";
--- a/o.n.bootstrap/launcher/windows/nbexecexe.cpp Wed Jan 11 14:23:31 2012 +0100
+++ a/o.n.bootstrap/launcher/windows/nbexecexe.cpp Fri Jan 13 15:13:55 2012 -0500
@@ -50,5 +50,10 @@
int main(int argc, char *argv[]) {
checkLoggingArg(argc, argv, true);
NBExecLoader loader;
- return loader.start("nbexec.dll", argc - 1, argv + 1);
+
+#if defined(_WIN64) || defined(WIN64) || defined(__MINGW64__)
+ return loader.start("nbexec64.dll", argc - 1, argv + 1);
+#else
+ return loader.start("nbexec.dll", argc - 1, argv + 1);
+#endif
}