Author: lisu Date: Tue Dec 16 08:31:07 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.5
---- Files affected:
SOURCES:
irrlicht-glXGetProcAddress.patch (1.3 -> 1.4) , irrlicht-system-libs.patch
(1.5 -> 1.6)
---- Diffs:
================================================================
Index: SOURCES/irrlicht-glXGetProcAddress.patch
diff -u SOURCES/irrlicht-glXGetProcAddress.patch:1.3
SOURCES/irrlicht-glXGetProcAddress.patch:1.4
--- SOURCES/irrlicht-glXGetProcAddress.patch:1.3 Mon Dec 3 08:13:24 2007
+++ SOURCES/irrlicht-glXGetProcAddress.patch Tue Dec 16 09:31:01 2008
@@ -1,6 +1,6 @@
---- irrlicht-1.4beta/source/Irrlicht/COpenGLExtensionHandler.cpp~
2007-10-04 19:17:51.000000000 +0200
-+++ irrlicht-1.4beta/source/Irrlicht/COpenGLExtensionHandler.cpp
2007-10-04 19:19:24.000000000 +0200
-@@ -179,7 +179,7 @@
+--- irrlicht-1.5/source/Irrlicht/COpenGLExtensionHandler.cpp~ 2008-12-14
07:15:56.000000000 +0100
++++ irrlicht-1.5/source/Irrlicht/COpenGLExtensionHandler.cpp 2008-12-16
08:57:41.000000000 +0100
+@@ -198,7 +198,7 @@
#ifndef _IRR_GETPROCADDRESS_WORKAROUND_
__GLXextFuncPtr (*IRR_OGL_LOAD_EXTENSION)(const GLubyte*)=0;
@@ -9,7 +9,7 @@
int major,minor;
glXQueryVersion(glXGetCurrentDisplay(), &major, &minor);
if ((major>1) || (minor>3))
-@@ -187,7 +187,7 @@
+@@ -206,7 +206,7 @@
else
#endif
IRR_OGL_LOAD_EXTENSION=glXGetProcAddressARB;
================================================================
Index: SOURCES/irrlicht-system-libs.patch
diff -u SOURCES/irrlicht-system-libs.patch:1.5
SOURCES/irrlicht-system-libs.patch:1.6
--- SOURCES/irrlicht-system-libs.patch:1.5 Fri Nov 21 13:43:33 2008
+++ SOURCES/irrlicht-system-libs.patch Tue Dec 16 09:31:02 2008
@@ -1,5 +1,5 @@
---- irrlicht-1.4.2/include/IrrCompileConfig.h~ 2008-11-21 13:12:56.000000000
+0100
-+++ irrlicht-1.4.2/include/IrrCompileConfig.h 2008-11-21 13:14:50.000000000
+0100
+--- irrlicht-1.5/include/IrrCompileConfig.h~ 2008-12-14 07:57:08.000000000
+0100
++++ irrlicht-1.5/include/IrrCompileConfig.h 2008-12-16 09:00:49.000000000
+0100
@@ -138,7 +138,7 @@
//! Define _IRR_USE_NON_SYSTEM_ZLIB_ to let irrlicht use the zlib which comes
with irrlicht.
/** If this is commented out, Irrlicht will try to compile using the zlib
installed in the system.
@@ -27,12 +27,12 @@
//! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9
---- irrlicht-1.4.2/source/Irrlicht/Makefile~ 2008-09-22 18:09:50.000000000
+0200
-+++ irrlicht-1.4.2/source/Irrlicht/Makefile 2008-11-21 13:17:34.000000000
+0100
-@@ -36,18 +36,18 @@
+--- irrlicht-1.5/source/Irrlicht/Makefile~ 2008-12-14 07:15:56.000000000
+0100
++++ irrlicht-1.5/source/Irrlicht/Makefile 2008-12-16 09:02:53.000000000
+0100
+@@ -36,14 +36,14 @@
IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryReadFile.o
CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CZipReader.o CPakReader.o
irrXML.o CAttributes.o
IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceStub.o
CIrrDeviceWin32.o CLogger.o COSOperator.o Irrlicht.o os.o
- IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o
CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o
CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o
CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o
CGUITabControl.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o
CDefaultGUIElementFactory.o CGUISpriteBank.o
+ IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o
CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o
CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o
CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o
CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o
CDefaultGUIElementFactory.o CGUISpriteBank.o
-ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o
zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o
zlib/zutil.o
-JPEGLIBOBJ = jpeglib/jcapimin.o jpeglib/jcapistd.o jpeglib/jccoefct.o
jpeglib/jccolor.o jpeglib/jcdctmgr.o jpeglib/jchuff.o jpeglib/jcinit.o
jpeglib/jcmainct.o jpeglib/jcmarker.o jpeglib/jcmaster.o jpeglib/jcomapi.o
jpeglib/jcparam.o jpeglib/jcphuff.o jpeglib/jcprepct.o jpeglib/jcsample.o
jpeglib/jctrans.o jpeglib/jdapimin.o jpeglib/jdapistd.o jpeglib/jdatadst.o
jpeglib/jdatasrc.o jpeglib/jdcoefct.o jpeglib/jdcolor.o jpeglib/jddctmgr.o
jpeglib/jdhuff.o jpeglib/jdinput.o jpeglib/jdmainct.o jpeglib/jdmarker.o
jpeglib/jdmaster.o jpeglib/jdmerge.o jpeglib/jdphuff.o jpeglib/jdpostct.o
jpeglib/jdsample.o jpeglib/jdtrans.o jpeglib/jerror.o jpeglib/jfdctflt.o
jpeglib/jfdctfst.o jpeglib/jfdctint.o jpeglib/jidctflt.o jpeglib/jidctfst.o
jpeglib/jidctint.o jpeglib/jidctred.o jpeglib/jmemmgr.o jpeglib/jmemnobs.o
jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o
-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
@@ -41,15 +41,10 @@
+#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
EXTRAOBJ =
- LINKOBJ := $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
+ LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
- $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(EXTRAOBJ)
+ $(IRRGUIOBJ) $(EXTRAOBJ)
###############
#Compiler flags
--CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
-+CXXINCS = -I../../include
- CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1
- CXXFLAGS = -Wall
- ifndef NDEBUG
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/irrlicht-glXGetProcAddress.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/irrlicht-system-libs.patch?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
