diff options
| author | Andrew Niefer | 2009-09-01 21:05:12 +0000 |
|---|---|---|
| committer | Andrew Niefer | 2009-09-01 21:05:12 +0000 |
| commit | 4134ebe2df92a0dfe4e3573814d4ff47e26a0886 (patch) | |
| tree | 56139b386c95fe4683add41a5d2de9df4194b145 /bundles/org.eclipse.equinox.executable/library/win32 | |
| parent | 749eca7bcbda579d405081b25da9c38cf6c96ed8 (diff) | |
| download | rt.equinox.framework-4134ebe2df92a0dfe4e3573814d4ff47e26a0886.tar.gz rt.equinox.framework-4134ebe2df92a0dfe4e3573814d4ff47e26a0886.tar.xz rt.equinox.framework-4134ebe2df92a0dfe4e3573814d4ff47e26a0886.zip | |
bug 273341 - -console or running as eclipsec.exe should change default vm to java.exe instead of javaw
Diffstat (limited to 'bundles/org.eclipse.equinox.executable/library/win32')
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/library/win32/build.bat | 2 | ||||
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/library/win32/eclipseWin.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/win32/build.bat b/bundles/org.eclipse.equinox.executable/library/win32/build.bat index 2ce6387b6..b1c49fc44 100644 --- a/bundles/org.eclipse.equinox.executable/library/win32/build.bat +++ b/bundles/org.eclipse.equinox.executable/library/win32/build.bat @@ -39,7 +39,7 @@ IF x.%1==x.ia64 GOTO IA64 :X86 IF x.%JAVA_HOME%==x. set JAVA_HOME=C:\Dev\Java\IBM-1.5.0-20090707-SR10 set javaHome=%JAVA_HOME% -if not "%MSVC_HOME%" == "" goto MAKE +if not x.%MSVC_HOME% == x. goto MAKE set MSVC_HOME="C:\Program Files\MS_PLAT_SDK\msvc60\VC98" call %MSVC_HOME%\bin\vcvars32.bat if not "%mssdk%" == "" goto MAKE diff --git a/bundles/org.eclipse.equinox.executable/library/win32/eclipseWin.c b/bundles/org.eclipse.equinox.executable/library/win32/eclipseWin.c index 40bd96d9c..013400f39 100644 --- a/bundles/org.eclipse.equinox.executable/library/win32/eclipseWin.c +++ b/bundles/org.eclipse.equinox.executable/library/win32/eclipseWin.c @@ -31,6 +31,7 @@ extern HWND topWindow; /* Global Variables */ _TCHAR* defaultVM = _T("javaw.exe"); +_TCHAR* consoleVM = _T("java.exe"); _TCHAR* vmLibrary = _T("jvm.dll"); _TCHAR* shippedVMDir = _T("jre\\bin\\"); |