Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Robin Cook (2e933988349509e5de21aafdef297f5635fdefab)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (2e933988349509e5de21aafdef297f5635fdefab)
  • Date: Sun, 16 Jul 2006 13:33:56 -0500

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

graphics/wings3d/BUILD | 9 +++++++--
graphics/wings3d/HISTORY | 5 +++++
graphics/wings3d/INSTALL | 2 ++
3 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 2e933988349509e5de21aafdef297f5635fdefab
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

wings3d: set -L path correctly if xorg-modular install

diff --git a/graphics/wings3d/BUILD b/graphics/wings3d/BUILD
index 95867ab..62bf2a9 100755
--- a/graphics/wings3d/BUILD
+++ b/graphics/wings3d/BUILD
@@ -1,5 +1,10 @@
-sedit 's:GL_LIBS = -lGLU -lGL:GL_LIBS = -L/usr/X11R6/lib -lGLU -lGL:' \
-plugins_src/accel/Makefile &&
+local WINGS3D_PATH &&
+
+if spell_ok xorg-server; then
+ sedit 's:GL_LIBS = -lGLU -lGL:GL_LIBS = -L/usr/lib -lGLU -lGL:'
plugins_src/accel/Makefile
+else
+ sedit 's:GL_LIBS = -lGLU -lGL:GL_LIBS = -L/usr/X11R6/lib -lGLU -lGL:'
plugins_src/accel/Makefile
+fi &&

export ESDL_PATH=/usr/lib/esdl &&
WINGS3D_PATH=/usr/lib/wings &&
diff --git a/graphics/wings3d/HISTORY b/graphics/wings3d/HISTORY
index 3c542cf..10d893c 100644
--- a/graphics/wings3d/HISTORY
+++ b/graphics/wings3d/HISTORY
@@ -1,3 +1,8 @@
+2006-07-16 Robin Cook <rcook AT wyrms.net>
+ * BUILD: set -L correctly if xorg-modular used
+ set variable local
+ * INSTALL: set same varible as in BUILD as spell failing without it
+
2006-05-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.98.34

diff --git a/graphics/wings3d/INSTALL b/graphics/wings3d/INSTALL
index f6b6da4..8000ec7 100755
--- a/graphics/wings3d/INSTALL
+++ b/graphics/wings3d/INSTALL
@@ -1,3 +1,5 @@
+local WINGS3D &&
+WINGS3D_PATH=/usr/lib/wings &&
make_normal &&
mkdir -p $WINGS3D_PATH &&
cp -Rv e3d $WINGS3D_PATH &&



  • [SM-Commit] GIT changes to master grimoire by Robin Cook (2e933988349509e5de21aafdef297f5635fdefab), Robin Cook, 07/16/2006

Archive powered by MHonArc 2.6.24.

Top of Page