diff options
| author | Grant Gayed <grant_gayed@ca.ibm.com> | 2013-04-11 11:45:19 -0400 |
|---|---|---|
| committer | Grant Gayed <grant_gayed@ca.ibm.com> | 2013-04-11 11:49:04 -0400 |
| commit | 0e8780fecdad08e13acf40e49af437762eff1854 (patch) | |
| tree | 19cacc07436d438904069e79c5298104fa0560ba /bundles/org.eclipse.swt/Eclipse SWT PI | |
| parent | 650deb026c998b07523a6424f11db72ac0bd1b3a (diff) | |
| download | eclipse.platform.swt-0e8780fecdad08e13acf40e49af437762eff1854.tar.gz eclipse.platform.swt-0e8780fecdad08e13acf40e49af437762eff1854.tar.xz eclipse.platform.swt-0e8780fecdad08e13acf40e49af437762eff1854.zip | |
finish support of 64-bit XULRunner on win32
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI')
| -rwxr-xr-x | bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat | 14 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak | 20 |
2 files changed, 26 insertions, 8 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 f7b23686e0..a5bc068bda 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 @@ -14,7 +14,7 @@ IF EXIST C:\BUILD\swt-builddir set SWT_BUILDDIR=C:\BUILD\swt-builddir IF x.%SWT_BUILDDIR%==x. set SWT_BUILDDIR=S:\swt-builddir echo SWT build dir: %SWT_BUILDDIR% -IF x.%MSSDK%==x. set MSSDK="%SWT_BUILDDIR%\MSSDKs\Microsoft SDK 6.0 Vista" +IF x.%MSSDK%==x. set MSSDK="%SWT_BUILDDIR%\MSSDKs\Windows Server 2003 SP1 SDK" IF x.%1==x.x86 GOTO X86 IF x.%1==x.x86_64 GOTO X86_64 @@ -40,11 +40,19 @@ GOTO MAKE :X86_64 -call %MSSDK%\setenv /X64 /RETAIL 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.%XULRUNNER_SDK%==x. set XULRUNNER_SDK=C:\xulrunner-10-64\xulrunner-sdk set CFLAGS=-DJNI64 +IF x.%BUILD_XULRUNNER%==x.true GOTO XULRUNNER64 +call %MSSDK%\setenv /X64 /RETAIL +shift +GOTO MAKE + +:XULRUNNER64 +set MSSDK="%SWT_BUILDDIR%\MSSDKs\Windows 7 SDK v7.1" +call %MSSDK%\bin\setenv /x64 /Release +IF x.%XULRUNNER_SDK%==x. set XULRUNNER_SDK=%SWT_BUILDDIR%\gecko10-sdk-x86_64 +set MOZILLACFLAGS=-DJNI64 shift GOTO MAKE 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 39d5489d79..989f398fcf 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 @@ -54,17 +54,18 @@ WGL_OBJS = wgl.obj wgl_structs.obj wgl_stats.obj XULRUNNER_PREFIX = swt-xulrunner XULRUNNER_LIB = $(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).dll -XULRUNNER_LIBS = Advapi32.lib $(XULRUNNER_SDK)\sdk\lib\xpcomglue.lib +XULRUNNER_LIBS = Advapi32.lib $(XULRUNNER_SDK)\lib\xpcomglue.lib XULRUNNER_OBJS = xpcom.obj xpcom_custom.obj xpcom_structs.obj xpcom_stats.obj +XPCOMINIT_OBJS = xpcominit.obj xpcominit_structs.obj xpcominit_stats.obj MOZILLACFLAGS = -c \ -O1 \ - -DJNI64 \ + $(MOZILLACFLAGS) \ -DSWT_VERSION=$(SWT_VERSION) \ $(NATIVE_STATS) \ + -MD \ -DMOZILLA_STRICT_API=1 \ -W3 \ - -MD \ -I. \ -I"$(JAVA_HOME)/include" \ -I"$(JAVA_HOME)/include/win32" \ @@ -85,7 +86,7 @@ CFLAGS = -O1 -DNDEBUG $(cflags) $(cvarsmt) $(CFLAGS) \ /I"$(JAVA_HOME)\include" /I"$(JAVA_HOME)\include\win32" /I. RCFLAGS = $(rcflags) $(rcvars) $(RCFLAGS) -DSWT_FILE_VERSION=\"$(maj_ver).$(min_ver)\" -DSWT_COMMA_VERSION=$(comma_ver) -all: make_xulrunner +all: make_swt make_awt make_gdip make_wgl webkit_win32_custom.obj: webkit_win32_custom.cpp cl $(WEBKITCFLAGS) webkit_win32_custom.cpp @@ -162,7 +163,16 @@ make_wgl: $(WGL_OBJS) swt_wgl.res link @templrf del templrf -make_xulrunner: $(XULRUNNER_OBJS) swt_xpcom.res +make_xulrunner: $(XULRUNNER_OBJS) $(XPCOMINIT_OBJS) swt_xpcom.res + echo $(ldebug) $(dlllflags) >templrf + echo $(XULRUNNER_LIBS) >>templrf + echo $(XULRUNNER_OBJS) $(XPCOMINIT_OBJS) >>templrf + echo swt_xpcom.res >>templrf + echo -out:$(XULRUNNER_LIB) >>templrf + link @templrf + del templrf + +make_xulrunner64: $(XULRUNNER_OBJS) swt_xpcom.res echo $(ldebug) $(dlllflags) >templrf echo $(XULRUNNER_LIBS) >>templrf echo $(XULRUNNER_OBJS) >>templrf |