mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

60 lines
2.9 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/rene/blender/compile.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. diff -ur blender-2.33-orig/source/Makefile blender-2.33/source/Makefile
  20. --- blender-2.33-orig/source/Makefile 2004-04-16 17:55:12.000000000 +0200
  21. +++ blender-2.33/source/Makefile 2004-05-13 13:24:46.189355464 +0200
  22. @@ -107,10 +107,10 @@
  23. COMLIB += $(OCGDIR)/gameengine/blconverter/$(DEBUG_DIR)libblconverter.a
  24. COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a
  25. COMLIB += $(OCGDIR)/gameengine/ketsji/$(DEBUG_DIR)libketsji.a
  26. - COMLIB += $(NAN_SOLID)/lib/libsolid.a
  27. + COMLIB += $(SRCHOME)/../extern/solid/src/.libs/libsolid.a
  28. COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
  29. COMLIB += $(OCGDIR)/gameengine/blphys/fuzzics/$(DEBUG_DIR)libfuzzics.a
  30. - COMLIB += $(NAN_QHULL)/lib/libqhull.a
  31. + COMLIB += $(SRCHOME)/../extern/qhull/src/libqhull.a
  32. COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a
  33. COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a
  34. # COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
  35. @@ -316,11 +316,10 @@
  36. BINTARGETS += xplink
  37. BINTARGETS += blenderdynamic
  38. BINTARGETS += blenderplayer
  39. - BINTARGETS += blenderstatic
  40. endif
  41. ifeq ($(CPU),powerpc)
  42. BINTARGETS = blenderdynamic
  43. - BINTARGETS += blenderstatic
  44. + BINTARGETS += blenderplayer
  45. endif
  46. PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
  47. PYLIB += $(NAN_MXTEXTTOOLS)
  48. diff -ur blender-2.33-orig/source/nan_definitions.mk blender-2.33/source/nan_definitions.mk
  49. --- blender-2.33-orig/source/nan_definitions.mk 2004-05-01 20:07:58.000000000 +0200
  50. +++ blender-2.33/source/nan_definitions.mk 2004-05-13 13:20:58.566959328 +0200
  51. @@ -276,7 +276,7 @@
  52. export NAN_FREETYPE ?= /usr
  53. export NAN_GETTEXT ?= /usr
  54. export NAN_SDL ?= $(shell sdl-config --prefix)
  55. - export NAN_SDLLIBS ?= $(shell sdl-config --libs)
  56. + export NAN_SDLLIBS ?= $(shell sdl-config --libs) -lsmpeg
  57. export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
  58. # Uncomment the following line to use Mozilla inplace of netscape