premake/patches/709.patch
author Ryan C. Gordon
Mon, 04 Jan 2016 16:25:27 -0500
changeset 10006 5229da175b57
parent 7925 f090a47eb7f7
permissions -rwxr-xr-x
x11: Support _NET_WM_USER_TIME and give _NET_ACTIVE_WINDOW a valid timestamp.

Fixes Bugzilla #3056.
     1 # HG changeset patch
     2 # User Ben Henning
     3 # Date 1375901577 25200
     4 #      Wed Aug 07 11:52:57 2013 -0700
     5 # Node ID 1d820b5754a9bc79b5c4c6a26d1acc170ebf4784
     6 # Parent  0af3bf0e3755477eafb247935db77b2765df2d19
     7 Updated the GCC make option to handle its linker cmomand generation a bit
     8 differently. Rather than putting the sibling libraries before the linker
     9 flags, they are put after. This allows for some extra flexibility in putting
    10 custom linker libraries before the list of sibling libraries, in case one of
    11 them depends on it.
    12 
    13 diff --git a/src/actions/make/make_cpp.lua b/src/actions/make/make_cpp.lua
    14 --- a/src/actions/make/make_cpp.lua
    15 +++ b/src/actions/make/make_cpp.lua
    16 @@ -267,11 +267,12 @@
    17  				_p('  LINKCMD    = $(AR) -rcs $(TARGET) $(OBJECTS)')
    18  			end
    19  		else
    20 +			-- Ben: changed order of ALL_LDFLAGS and LIBS (switched them)
    21  			-- this was $(TARGET) $(LDFLAGS) $(OBJECTS)
    22  			--  but had trouble linking to certain static libs so $(OBJECTS) moved up
    23  			-- then $(LDFLAGS) moved to end
    24  			--   https://sourceforge.net/tracker/?func=detail&aid=3430158&group_id=71616&atid=531880
    25 -			_p('  LINKCMD    = $(%s) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(ALL_LDFLAGS)', iif(cfg.language == "C", "CC", "CXX"))
    26 +			_p('  LINKCMD    = $(%s) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)', iif(cfg.language == "C", "CC", "CXX"))
    27  		end
    28  	end
    29