Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiraj Modi2017-08-23 10:39:29 +0000
committerNiraj Modi2017-08-23 12:49:08 +0000
commit33948966acb394d59cc26b95720cdd75453b403e (patch)
treea4ce2f02d427a7705d808ad2996f211e8b973a70 /bundles/org.eclipse.swt
parenta421c3c24a7f9b33d403f20611bad5fac3183cc7 (diff)
downloadeclipse.platform.swt-33948966acb394d59cc26b95720cdd75453b403e.tar.gz
eclipse.platform.swt-33948966acb394d59cc26b95720cdd75453b403e.tar.xz
eclipse.platform.swt-33948966acb394d59cc26b95720cdd75453b403e.zip
Bug 520296 - [win32] Upgrade Windows native build to use Java8I20170827-2000I20170826-1500I20170825-2000I20170824-2000I20170823-2000
Change-Id: I07f3afecd258da8eab096f375cbe622a4367dd8f Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
Diffstat (limited to 'bundles/org.eclipse.swt')
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak4
2 files changed, 5 insertions, 5 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat
index 994050393f..7d867a192a 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat
@@ -1,5 +1,5 @@
@rem ***************************************************************************
-@rem Copyright (c) 2000, 2013 IBM Corporation and others.
+@rem Copyright (c) 2000, 2017 IBM Corporation and others.
@rem All rights reserved. This program and the accompanying materials
@rem are made available under the terms of the Eclipse Public License v1.0
@rem which accompanies this distribution, and is available at
@@ -23,7 +23,7 @@ IF x.%1==x.ia64 GOTO IA64
:X86
IF "x.%OUTPUT_DIR%"=="x." set OUTPUT_DIR=..\..\..\org.eclipse.swt.win32.win32.x86
-IF x.%JAVA_HOME%==x. set JAVA_HOME=%SWT_BUILDDIR%\ibm-java2-sdk-50-win-i386
+IF x.%JAVA_HOME%==x. set JAVA_HOME=%SWT_BUILDDIR%\ibm-java-sdk-80-win-i386\sdk
call "%SWT_BUILDDIR%\MSVCs\Microsoft Visual Studio 8\Common7\Tools\vsvars32.bat"
call %MSSDK%\setenv /XP32 /RETAIL
IF x.%1==x.x86 shift
@@ -33,7 +33,7 @@ GOTO MAKE
set PROCESSOR_ARCHITECTURE=AMD64
IF "x.%OUTPUT_DIR%"=="x." set OUTPUT_DIR=..\..\..\org.eclipse.swt.win32.win32.x86_64
-IF x.%JAVA_HOME%==x. set JAVA_HOME=%SWT_BUILDDIR%\ibm-sdk50-x86_64
+IF x.%JAVA_HOME%==x. set JAVA_HOME=%SWT_BUILDDIR%\ibm-java-sdk-80-win-x86_64\sdk
set CFLAGS=-DJNI64
call %MSSDK%\setenv /X64 /RETAIL
shift
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
index 1dfc1a72b2..e72aff8488 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2000, 2015 IBM Corporation and others.
+# Copyright (c) 2000, 2017 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -34,7 +34,7 @@ GDIP_OBJS = gdip.obj gdip_structs.obj gdip_stats.obj gdip_custom.obj
AWT_PREFIX = swt-awt
AWT_LIB = $(AWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).dll
-AWT_LIBS = "$(JAVA_HOME)\jre\bin\jawt.lib"
+AWT_LIBS = "$(JAVA_HOME)\lib\jawt.lib"
AWT_OBJS = swt_awt.obj
WEBKIT_DIR = $(WEBKIT_HOME)\WebKit-r72896

Back to the top