diff options
| author | Grant Gayed <ggayed> | 2011-01-11 15:30:59 +0000 |
|---|---|---|
| committer | Grant Gayed <ggayed> | 2011-01-11 15:30:59 +0000 |
| commit | 1c48b7044e352184a5d26af34e43cd4cfdc18c92 (patch) | |
| tree | ab5a2081747df3403a169895be0a6580a95351b9 | |
| parent | 311ce94e0d549375936722847ce5d9500926f3f3 (diff) | |
| download | eclipse.platform.swt-1c48b7044e352184a5d26af34e43cd4cfdc18c92.tar.gz eclipse.platform.swt-1c48b7044e352184a5d26af34e43cd4cfdc18c92.tar.xz eclipse.platform.swt-1c48b7044e352184a5d26af34e43cd4cfdc18c92.zip | |
fix webkit for 64-bit archs
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak | 2 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/tasks/build.xml | 2 |
2 files changed, 2 insertions, 2 deletions
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 94c83ec05d..ee3b4841c4 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 @@ -84,7 +84,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_swt make_awt make_gdip make_wgl make_webkit +all: make_swt make_awt make_gdip make_wgl webkit_win32_custom.obj: webkit_win32_custom.cpp cl $(WEBKITCFLAGS) webkit_win32_custom.cpp diff --git a/bundles/org.eclipse.swt/tasks/build.xml b/bundles/org.eclipse.swt/tasks/build.xml index b5c0cf3713..b7054ea9b1 100644 --- a/bundles/org.eclipse.swt/tasks/build.xml +++ b/bundles/org.eclipse.swt/tasks/build.xml @@ -66,7 +66,7 @@ <target name="build_win32_x86" depends="init_build"> <property name="clean" value="clean"/> - <property name="targets" value="x86 all install"/> + <property name="targets" value="x86 all make_webkit install"/> <exec dir="${basedir}/${builddir}" executable="${basedir}/${builddir}/build.bat" failonerror="true"> <env key="JAVA_HOME" value=""/> <arg line="${targets}"/> |