[paketler-commits] r36213 - in playground/murat/applications/games/irrlicht: . files

[paketler-commits at pardus.org.tr]

Author: murat
Date: Sat Dec  8 13:56:59 2007
New Revision: 36213

Modified:
   playground/murat/applications/games/irrlicht/actions.py
   playground/murat/applications/games/irrlicht/files/makefile.patch
Log:
fix makefile patch

Modified: playground/murat/applications/games/irrlicht/actions.py
=================================================================
--- playground/murat/applications/games/irrlicht/actions.py	(original)
+++ playground/murat/applications/games/irrlicht/actions.py	Sat Dec  8 13:56:59 2007
@@ -22,17 +22,17 @@
     shelltools.cd("source/Irrlicht")
     autotools.make("sharedlib")
 
-    shelltools.cd("../../tools/GUIEditor")
-    autotools.make()
+    #shelltools.cd("../../tools/GUIEditor")
+    #autotools.make()
 
-    shelltools.cd("../IrrFontTool/newFontTool")
-    autotools.make()
+    #shelltools.cd("../IrrFontTool/newFontTool")
+    #autotools.make()
 
-    shelltools.cd("../../../examples")
-    for dirs in os.listdir("."):
-        shelltools.cd(dirs)
-        autotools.make()
-        shelltools.cd("..")
+    #shelltools.cd("../../../examples")
+    #for dirs in os.listdir("."):
+        #shelltools.cd(dirs)
+        #autotools.make()
+        #shelltools.cd("..")
 
 def install():
     pisitools.dolib_so("lib/Linux/libIrrlicht.so.1.3.0")

Modified: playground/murat/applications/games/irrlicht/files/makefile.patch
=================================================================
--- playground/murat/applications/games/irrlicht/files/makefile.patch	(original)
+++ playground/murat/applications/games/irrlicht/files/makefile.patch	Sat Dec  8 13:56:59 2007
@@ -1,29 +1,31 @@
---- source/Irrlicht/Makefile.orig	2007-06-07 15:06:40.000000000 +0300
-+++ source/Irrlicht/Makefile	2007-10-14 17:50:16.000000000 +0300
-@@ -30,30 +30,30 @@
- LIBPNGOBJ = libpng/png.o libpng/pngerror.o libpng/pngget.o libpng/pngmem.o libpng/pngpread.o libpng/pngread.o libpng/pngrio.o libpng/pngrtran.o libpng/pngrutil.o libpng/pngset.o libpng/pngtrans.o libpng/pngwio.o libpng/pngwrite.o libpng/pngwtran.o libpng/pngwutil.o
- # Next variable is for additional scene nodes etc. of customized Irrlicht versions
+--- source/Irrlicht/Makefile.orig	2007-11-29 18:16:36.000000000 +0200
++++ source/Irrlicht/Makefile	2007-12-08 13:58:17.000000000 +0200
+@@ -43,33 +43,33 @@
  EXTRAOBJ =
--LINKOBJ = $(IRROBJ) $(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(EXTRAOBJ)
-+LINKOBJ = $(IRROBJ) $(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) $(IRRGUIOBJ) $(EXTRAOBJ)
+ LINKOBJ := $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
+ 	$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
+-	$(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(EXTRAOBJ)
++	$(IRRGUIOBJ) $(EXTRAOBJ)
  
  ###############
  #Compiler flags
 -CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
 -CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1
 -CXXFLAGS = -Wall
-+CXXINCS = -I../../include
-+CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
-+CXXFLAGS +=
++CXXINCS += -I../../include
++CPPFLAGS += $(CFLAGS) $(CXXINCS) -DIRRLICHT_EXPORTS=1
++CXXFLAGS += -Wall
  ifndef NDEBUG
--CXXFLAGS += -g
-+CXXFLAGS +=
+ CXXFLAGS += -g -D_DEBUG
  else
 -CXXFLAGS += -fexpensive-optimizations -O3
-+CXXFLAGS +=
++CXXFLAGS += $(CFLAGS)
+ endif
+ ifdef PROFILE
+ CXXFLAGS += -pg
  endif
 -CFLAGS := -fexpensive-optimizations -O3 -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
-+CFLAGS +=
++CFLAGS += -fexpensive-optimizations -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
  
  #Linux specific options
  STATIC_LIB = libIrrlicht.a
@@ -34,21 +36,10 @@
 +INSTALL_DIR = /usr/lib
  staticlib sharedlib install: SYSTEM = Linux
  staticlib sharedlib : LDFLAGS = --no-export-all-symbols --add-stdcall-alias
--sharedlib : LDFLAGS += -L/usr/X11R6/lib -lGLU -lGL -lXxf86vm
+-sharedlib : LDFLAGS += -L/usr/X11R6/lib -lGL -lXxf86vm
 -staticlib sharedlib : CXXINCS += -I/usr/X11R6/include
 +sharedlib : LDFLAGS += -L/usr/lib -lGLU -lGL -lXxf86vm -lXext -lX11 -lpng -ljpeg
 +staticlib sharedlib : CXXINCS += -I/usr/include
  
  #Windows specific options
  sharedlib_win32 staticlib_win32: SYSTEM = Win32-gcc
-@@ -67,8 +67,8 @@
- 
- # Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into /lib/Linux
- sharedlib: $(LINKOBJ)
--	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -fPIC -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
--	cp $(SHARED_LIB).$(VERSION) $(LIB_PATH)
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).1 -fPIC -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
-+	cp $(SHARED_LIB).$(VERSION) $(LIB_PATH) && ln -s $(SHARED_LIB).$(VERSION) $(LIB_PATH)/$(SHARED_LIB)
- 
- # Builds Irrlicht as static lib (libIrrlicht.a)
- $(STATIC_LIB): $(LINKOBJ)