[egoboo/f17] Revert "Adjust for new Makefile location"

Bruno Wolff III bruno at fedoraproject.org
Fri Apr 27 04:26:52 UTC 2012


commit 1b09824d6381ac9bcd939a109818511e5b0b3836
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Thu Apr 26 23:09:48 2012 -0500

    Revert "Adjust for new Makefile location"
    
    This reverts commit 3b334ae3304acc2b2f27891ba45d78ffc31e588b.

 egoboo.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/egoboo.spec b/egoboo.spec
index a4c2903..ee172e8 100644
--- a/egoboo.spec
+++ b/egoboo.spec
@@ -26,7 +26,11 @@ dimension.
 %patch0 -b .opts
 
 %build
-make -C src/game
+# We override ENET_OBJ and LDFLAGS to use the system enet
+make -C game -f Makefile.unix ENET_OBJ= \
+  CFLAGS="$RPM_OPT_FLAGS `sdl-config --cflags` -DENET11" \
+  LDFLAGS="`sdl-config --libs` -lSDL_ttf -lSDL_mixer -lSDL_image -lGL -lGLU -lenet -lm"
+
 
 %install
 rm -rf $RPM_BUILD_ROOT


More information about the scm-commits mailing list