diff options
| -rw-r--r-- | doc/index.html | 19 | ||||
| -rw-r--r-- | src/glew.mk | 14 | ||||
| -rw-r--r-- | src/lcms.mk | 7 |
3 files changed, 24 insertions, 16 deletions
diff --git a/doc/index.html b/doc/index.html index 7273ce9..0d89e5a 100644 --- a/doc/index.html +++ b/doc/index.html @@ -450,6 +450,10 @@ AR=$(CROSS)ar</pre> <td></td> </tr> <tr> + <td><a href="http://www.cmake.org/">CMake</a></td> + <td></td> + </tr> + <tr> <td><a href="http://en.wikipedia.org/wiki/C_standard_library">LibC</a> for 32-bit</td> <td></td> </tr> @@ -498,7 +502,7 @@ AR=$(CROSS)ar</pre> <h3>Debian</h3> - <pre>aptitude install -R bash bzip2 g++ make sed openssl \ + <pre>aptitude install -R bash bzip2 cmake g++ make sed openssl \ patch perl scons unzip wget</pre> <p> @@ -508,7 +512,7 @@ AR=$(CROSS)ar</pre> <h3>FreeBSD</h3> - <pre>pkg_add -r bash gmake gsed perl scons unzip wget</pre> + <pre>pkg_add -r bash cmake gmake gsed perl scons unzip wget</pre> <p> On 64-bit FreeBSD, @@ -517,7 +521,7 @@ AR=$(CROSS)ar</pre> <h3>Frugalware</h3> - <pre>pacman-g2 -S bash bzip2 gcc make sed openssl \ + <pre>pacman-g2 -S bash bzip2 cmake gcc make sed openssl \ patch perl scons unzip wget</pre> <p> @@ -534,7 +538,7 @@ AR=$(CROSS)ar</pre> <a href="http://www.macports.org/">MacPorts</a>, then run: </p> - <pre>sudo port install gmake gsed scons wget</pre> + <pre>sudo port install cmake gmake gsed scons wget</pre> <h3>MacOS 10.6</h3> @@ -545,7 +549,7 @@ AR=$(CROSS)ar</pre> <a href="http://www.macports.org/">MacPorts</a>, then run: </p> - <pre>sudo port install gmake gsed scons wget gcc_select + <pre>sudo port install cmake gmake gsed scons wget gcc_select sudo gcc_select gcc40</pre> <h3>Open Solaris 2009.06</h3> @@ -563,8 +567,9 @@ sudo gcc_select gcc40</pre> First, install all requirements that already ship with Solaris: </p> - <pre>pfexec pkg install SUNWgcc SUNWgmake SUNWgsed SUNWgzip \ - SUNWlibm SUNWgpch SUNWunzip SUNWwget</pre> + <pre>pfexec pkg install SUNWcmake SUNWgcc SUNWgmake SUNWgsed \ + SUNWgzip SUNWlibm SUNWgpch SUNWunzip \ + SUNWwget</pre> <p> Then download and install SCons by hand: diff --git a/src/glew.mk b/src/glew.mk index 9a32a67..12a3d1e 100644 --- a/src/glew.mk +++ b/src/glew.mk @@ -1,5 +1,5 @@ -# Copyright (C) 2009 Volker Grabsch -# Martin Lambers +# Copyright (C) 2009, 2010 Volker Grabsch +# Martin Lambers # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -23,17 +23,17 @@ # GLEW PKG := glew $(PKG)_IGNORE := -$(PKG)_VERSION := 1.5.1 -$(PKG)_CHECKSUM := a94113169d46487ccda1bb2fde68fa1803bdf009 -$(PKG)_SUBDIR := glew -$(PKG)_FILE := glew-$($(PKG)_VERSION)-src.tgz +$(PKG)_VERSION := 1.5.2 +$(PKG)_CHECKSUM := 21fa100ff77d10f6767ef387f65de98eaaaa683f +$(PKG)_SUBDIR := glew-$($(PKG)_VERSION) +$(PKG)_FILE := glew-$($(PKG)_VERSION).tgz $(PKG)_WEBSITE := http://glew.sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/glew/glew/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/glew/files/glew/) | \ - $(SED) -n 's,.*glew-\([0-9][^>]*\)-src\.tgz.*,\1,p' | \ + $(SED) -n 's,.*glew-\([0-9][^>]*\)\.tgz.*,\1,p' | \ tail -1 endef diff --git a/src/lcms.mk b/src/lcms.mk index 9986569..c90c279 100644 --- a/src/lcms.mk +++ b/src/lcms.mk @@ -1,5 +1,6 @@ -# Copyright (C) 2009 Volker Grabsch -# Bart van Andel +# Copyright (C) 2009, 2010 Volker Grabsch +# Bart van Andel +# Martin Lambers # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -39,6 +40,8 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD + # wine confuses the cross-compiling detection, so set it explicitly + $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ |