changeset 61:5ce9278ca82c

Added win32 static libs.
author Frank Benoit <benoit@tionex.de>
date Wed, 01 Apr 2009 13:10:06 +0200
parents 66be6a990713
children 059e3b45add7
files org.eclipse.swt.win32.win32.x86/lib/advapi32.lib org.eclipse.swt.win32.win32.x86/lib/comctl32.lib org.eclipse.swt.win32.win32.x86/lib/comdlg32.lib org.eclipse.swt.win32.win32.x86/lib/msimg32.lib org.eclipse.swt.win32.win32.x86/lib/ole32.lib org.eclipse.swt.win32.win32.x86/lib/oleacc.lib org.eclipse.swt.win32.win32.x86/lib/oleaut32.lib org.eclipse.swt.win32.win32.x86/lib/olepro32.lib org.eclipse.swt.win32.win32.x86/lib/opengl32.lib org.eclipse.swt.win32.win32.x86/lib/shlwapi.lib org.eclipse.swt.win32.win32.x86/lib/usp10.lib rakefile
diffstat 12 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
Binary file org.eclipse.swt.win32.win32.x86/lib/advapi32.lib has changed
Binary file org.eclipse.swt.win32.win32.x86/lib/comctl32.lib has changed
Binary file org.eclipse.swt.win32.win32.x86/lib/comdlg32.lib has changed
Binary file org.eclipse.swt.win32.win32.x86/lib/msimg32.lib has changed
Binary file org.eclipse.swt.win32.win32.x86/lib/ole32.lib has changed
Binary file org.eclipse.swt.win32.win32.x86/lib/oleacc.lib has changed
Binary file org.eclipse.swt.win32.win32.x86/lib/oleaut32.lib has changed
Binary file org.eclipse.swt.win32.win32.x86/lib/olepro32.lib has changed
Binary file org.eclipse.swt.win32.win32.x86/lib/opengl32.lib has changed
Binary file org.eclipse.swt.win32.win32.x86/lib/shlwapi.lib has changed
Binary file org.eclipse.swt.win32.win32.x86/lib/usp10.lib has changed
--- a/rakefile	Mon Mar 30 14:46:59 2009 +0200
+++ b/rakefile	Wed Apr 01 13:10:06 2009 +0200
@@ -27,7 +27,7 @@
 DIR_OBJ     = File.expand_path("obj")
 DIR_IMP     = File.expand_path("imp")
 DIR_LIB     = File.expand_path("lib")
-BINDIR      = File.expand_path("bin")
+DIR_BIN     = File.expand_path("bin")
 FILE_RSP    = File.expand_path("rsp")
 ALL_RESDIRS = [ "base/res", "res" ]
 
@@ -42,6 +42,7 @@
     EXEEXT   = ".exe"
     MAPEXT   = ".map"
     PROG_LIB = "lib.exe"
+    DIR_WINLIBS = File.expand_path(File.join(BASEDIR_SWT,"lib"))
 else
     BASEDIR_SWT = "org.eclipse.swt.gtk.linux.x86"
     LIBEXT   = ".a"
@@ -236,7 +237,7 @@
 
     rsp.puts "-op"
     rsp.puts "-od#{DIR_OBJ.to_path}"
-    applfile = File.join(BINDIR,appnameprefix+appname+EXEEXT)
+    applfile = File.join(DIR_BIN ,appnameprefix+appname+EXEEXT)
     rsp.puts "-of#{applfile.to_path}"
     filelist.each do |path|
         rsp.puts File.expand_path(path).to_path[ srcdir_abs.size+1 .. -1 ]
@@ -289,6 +290,7 @@
     FileUtils.rm_rf DIR_IMP
     FileUtils.rm_rf DIR_OBJ
     FileUtils.rm_rf DIR_LIB
+    FileUtils.rm_rf DIR_BIN
     FileUtils.rm FILE_RSP, :force => true
     FileUtils.rm LOG_STDOUT, :force => true
     FileUtils.rm LOG_STDERR, :force => true
@@ -302,6 +304,9 @@
 desc "Build SWT"
 task :swt do
     buildTree( BASEDIR_SWT, "src", "res" )
+    if isWindows
+        FileUtils.cp FileList[ File.join(DIR_WINLIBS, "*#{LIBEXT}") ], DIR_LIB
+    end
 end
 
 desc "Build Equinox"