Mercurial > projects > dwt2

changeset 76:f05e6e8b2f2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pragma libs
author Frank Benoit <benoit@tionex.de>
date Sun, 12 Apr 2009 12:27:13 +0200
parents 0b015f5925d8
children af948d4bbf8c 0a55d2d5a946
files base/src/java/lang/all.d base/src/java/util/zip/InflaterInputStream.d org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/SWT.d
diffstat 3 files changed, 40 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/base/src/java/lang/all.d	Sat Apr 11 11:32:49 2009 +0200
+++ b/base/src/java/lang/all.d	Sun Apr 12 12:27:13 2009 +0200
@@ -1,5 +1,6 @@
 module java.lang.all;
 
+pragma( lib, "dwt-base.lib" );
 
 public import java.lang.Boolean;
 public import java.lang.Byte;
--- a/base/src/java/util/zip/InflaterInputStream.d	Sat Apr 11 11:32:49 2009 +0200
+++ b/base/src/java/util/zip/InflaterInputStream.d	Sun Apr 12 12:27:13 2009 +0200
@@ -9,9 +9,10 @@
     import tango.io.compress.ZlibStream;
     import tango.io.device.Conduit;
     version(Windows){
-        version(build){
-            pragma(link,"zlib");
-        }
+        pragma(lib,"zlib.lib");
+    }
+    else{
+        pragma(lib,"zlib");
     }
 } else { // Phobos
     import std.zlib;
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/SWT.d	Sat Apr 11 11:32:49 2009 +0200
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/SWT.d	Sun Apr 12 12:27:13 2009 +0200
@@ -22,25 +22,45 @@
 import java.lang.all;
 
 version(build){
-    pragma(link, "advapi32");
-    pragma(link, "comctl32");
-    pragma(link, "comdlg32");
-    pragma(link, "gdi32");
-    pragma(link, "kernel32");
-    pragma(link, "shell32");
-    pragma(link, "ole32");
-    pragma(link, "oleaut32");
-    pragma(link, "olepro32");
-    pragma(link, "oleacc");
-    pragma(link, "user32");
-    pragma(link, "usp10");
-    pragma(link, "msimg32");
-    pragma(link, "opengl32");
-    pragma(link, "shlwapi");
+    pragma(link, "advapi32.lib");
+    pragma(link, "comctl32.lib");
+    pragma(link, "comdlg32.lib");
+    pragma(link, "gdi32.lib");
+    pragma(link, "kernel32.lib");
+    pragma(link, "shell32.lib");
+    pragma(link, "ole32.lib");
+    pragma(link, "oleaut32.lib");
+    pragma(link, "olepro32.lib");
+    pragma(link, "oleacc.lib");
+    pragma(link, "user32.lib");
+    pragma(link, "usp10.lib");
+    pragma(link, "msimg32.lib");
+    pragma(link, "opengl32.lib");
+    pragma(link, "shlwapi.lib");
+    pragma(link, "org.eclipse.swt.win32.win32.x86.lib");
     //pragma(link, "gdiplus"); // load dynamic
     //pragma(link, "uxtheme"); // load dynamic
 }
 
+pragma(lib, "advapi32.lib");
+pragma(lib, "comctl32.lib");
+pragma(lib, "comdlg32.lib");
+pragma(lib, "gdi32.lib");
+pragma(lib, "kernel32.lib");
+pragma(lib, "shell32.lib");
+pragma(lib, "ole32.lib");
+pragma(lib, "oleaut32.lib");
+pragma(lib, "olepro32.lib");
+pragma(lib, "oleacc.lib");
+pragma(lib, "user32.lib");
+pragma(lib, "usp10.lib");
+pragma(lib, "msimg32.lib");
+pragma(lib, "opengl32.lib");
+pragma(lib, "shlwapi.lib");
+pragma(lib, "org.eclipse.swt.win32.win32.x86.lib");
+//pragma(link, "gdiplus"); // load dynamic
+//pragma(link, "uxtheme"); // load dynamic
+
 /**
  * This class provides access to a small number of SWT system-wide
  * methods, and in addition defines the public constants provided