diff options
| author | Silenio Quarti <silenio> | 2011-07-18 16:35:35 -0400 |
|---|---|---|
| committer | Silenio Quarti <silenio> | 2011-07-18 17:31:36 -0400 |
| commit | 418ee1a39b3fd0d951e80fc4922bb8a4ba352f05 (patch) | |
| tree | 92194caa684ecbcaebd3db3911820f492a3de014 | |
| parent | 68082ed64540f88d44b99ae23829e4cc7b04ff87 (diff) | |
| download | eclipse.platform.swt-418ee1a39b3fd0d951e80fc4922bb8a4ba352f05.tar.gz eclipse.platform.swt-418ee1a39b3fd0d951e80fc4922bb8a4ba352f05.tar.xz eclipse.platform.swt-418ee1a39b3fd0d951e80fc4922bb8a4ba352f05.zip | |
fixing wince build
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_wince.mak | 4 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/buildSWT.xml | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_wince.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_wince.mak index 4cdec3d8c2..bb2b1b1467 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_wince.mak +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_wince.mak @@ -48,7 +48,7 @@ swt.res: rc $(RCFLAGS) -DSWT_ORG_FILENAME=\"$(SWT_LIB)\" -r -fo swt.res swt.rc install: all - copy *.dll $(OUTPUT_DIR) + copy *.dll "$(OUTPUT_DIR)" clean: del *.obj *.res *.dll *.lib *.exp @@ -81,7 +81,7 @@ swt.res: rc $(RCFLAGS) -DSWT_ORG_FILENAME=\"$(SWT_LIB)\" -r -fo swt.res swt.rc install: all - copy *.dll $(OUTPUT_DIR) + copy *.dll "$(OUTPUT_DIR)" clean: del *.obj *.res *.dll *.lib *.exp diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml index c18a907066..1b3463b7be 100644 --- a/bundles/org.eclipse.swt/buildSWT.xml +++ b/bundles/org.eclipse.swt/buildSWT.xml @@ -865,8 +865,8 @@ <property name="clean" value="clean"/> <property name="targets" value="install"/> <property name="project_dir" value="${basedir}/${src.repo}"/> - <property name="output_dir" value="${basedir}${fragment_dir}"/> - <property name="build_dir" value="${basedir}${fragment_dir}/tmpdir"/> + <property name="output_dir" value="${basedir}/${fragment_dir}"/> + <property name="build_dir" value="${basedir}/${fragment_dir}/tmpdir"/> <delete dir="${build_dir}" quiet="true"/> <antcall target="copy.library.src"/> <condition property="build_task" value="build_local_win"> @@ -926,7 +926,7 @@ <pathconvert property="win_output_dir"> <path location="${output_dir}"></path> </pathconvert> - <condition property="build_file" value="build_ce.bat" else="build.bat"> + <condition property="build_file" value="build-ce.bat" else="build.bat"> <equals arg1="${swt.os}" arg2="wce_ppc"/> </condition> <exec dir="${build_dir}" executable="${build_dir}/${build_file}" failonerror="true"> @@ -936,7 +936,10 @@ <arg line="${clean}"/> </exec> <condition property="should_build_xulrunner" value="true"> - <equals arg1="${swt.arch}" arg2="x86"/> + <and> + <equals arg1="${swt.ws}" arg2="win32"/> + <equals arg1="${swt.arch}" arg2="x86"/> + </and> </condition> <antcall target="build_local_win_xulrunner"/> <delete dir="${tmpdir}" quiet="true"/> |