Mercurial > mxe-octave

changeset 732:5703bf82e5b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Volker Grabsch <vog@notjusthosting.com>
date Sun, 14 Feb 2010 19:02:10 +0100
parents 2fc6fe4bb9f4 (current diff) 2ffb38727a32 (diff)
children 6f7cdcfc3279
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/gcc.mk	Sun Feb 14 18:53:54 2010 +0100
+++ b/src/gcc.mk	Sun Feb 14 19:02:10 2010 +0100
@@ -80,7 +80,7 @@
 
     # create pkg-config script
     (echo '#!/bin/sh'; \
-     echo 'PKG_CONFIG_PATH= PKG_CONFIG_LIBDIR='\''$(PREFIX)/$(TARGET)/lib/pkgconfig'\'' exec pkg-config "$$@"') \
+     echo 'PKG_CONFIG_PATH= PKG_CONFIG_LIBDIR='\''$(PREFIX)/$(TARGET)/lib/pkgconfig'\'' exec pkg-config --static "$$@"') \
              > '$(PREFIX)/bin/$(TARGET)-pkg-config'
     chmod 0755 '$(PREFIX)/bin/$(TARGET)-pkg-config'
 endef
--- a/src/sdl.mk	Sun Feb 14 18:53:54 2010 +0100
+++ b/src/sdl.mk	Sun Feb 14 19:02:10 2010 +0100
@@ -31,6 +31,6 @@
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        `'$(TARGET)-pkg-config' sdl --cflags --static --libs` \
+        `'$(TARGET)-pkg-config' sdl --cflags --libs` \
         '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl.exe'
 endef