Removed unused hatch files.

[supertux.git] / mk / jam / win32.jam

diff --git a/mk/jam/win32.jam b/mk/jam/win32.jam
index f3e8dbd..fa97e52 100644 (file)
--- a/mk/jam/win32.jam
+++ b/mk/jam/win32.jam
@@ -22,9 +22,7 @@ rule CompileResources
 rule Win32Resource
 {
     local target = $($(<)_TARGET) ;
-    local rcobject = [ DoObjectGrist _resource.o ] ;
-    LOCATE on $(rcobject) = $(LOCATE_TARGET) ;
-    SEARCH on $(rcobject) = $(LOCATE_TARGET) ;
+    local rcobject = [ LocateTarget _resource.o ] ;
     
     # only add 1 resource object per target
     if ! $($(<)_HASWIN32RESOURCE)
@@ -60,14 +58,23 @@ rule SystemLinkApplication
   local target = $($(<)_TARGET) ;
 
   Depends $(target) : $(>) ;
+
+  if $(<)_WHOLE_ARCHIVE
+  {
+    WHOLE_ARCH_BEGIN on $(target) = -Wl,--whole-archive ;
+    WHOLE_ARCH_END on $(target) = -Wl,--no-whole-archive ;
+  }
+
   LinkApplication $(target) : $(>) ;
+  LIBS on $(target) = $(LIBS) ;
   # setup clean rules
   Clean clean : $(target) ;
   Clean $(<)clean : $(target) ;
 }
 
-actions LinkApplication bind NEEDLIBS bind EXTRAOBJECTS
+actions LinkApplication bind NEEDLIBS bind NEEDLIBS_WHOLE bind EXTRAOBJECTS
 {
-  $(LINK) -o $(<) $(>) $(EXTRAOBJECTS) $(NEEDLIBS) $(LFLAGS)
+  $(LINK) -o $(<) $(>) $(EXTRAOBJECTS) $(NEEDLIBS) $(WHOLE_ARCH_BEGIN) \
+    $(NEEDLIBS_WHOLE) $(WHOLE_ARCH_END) $(LIBS)
 }