[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19740] trunk/blender: This is patch [ #18408] Build issues with make on Cygwin hosted MinGW (2.48.1)

[Kent Mein]

Revision: 19740
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19740
Author:   sirdude
Date:     2009-04-15 18:23:13 +0200 (Wed, 15 Apr 2009)

Log Message:
-----------
This is patch [#18408] Build issues with make on Cygwin hosted MinGW (2.48.1)
submitted by Wayne Dennis

adds an include, changes pythonlib and does a little cleaning of dlltool stuff.

Kent

Modified Paths:
--------------
    trunk/blender/dlltool/Makefile
    trunk/blender/source/gameengine/GamePlayer/common/windows/Makefile
    trunk/blender/source/nan_definitions.mk

Modified: trunk/blender/dlltool/Makefile
===================================================================
--- trunk/blender/dlltool/Makefile	2009-04-15 16:16:00 UTC (rev 19739)
+++ trunk/blender/dlltool/Makefile	2009-04-15 16:23:13 UTC (rev 19740)
@@ -1,7 +1,5 @@
 include nan_definitions.mk
 
-PYTHONDLL=python$(subst .,,$(NAN_PYTHON_VERSION)).dll
-
 all: ${NAN_GETTEXT}/lib/freegettext.a  ${NAN_ICONV}/lib/freeiconv.a \
 		${NAN_PYTHON}/lib/freepy.a
 
@@ -24,15 +22,6 @@
 	ranlib ${NAN_ICONV}/lib/freeiconv.a
 	rm ./iconv.dll
 
-${NAN_PYTHON}/lib/freepy.a: python.def ${NAN_PYTHON}/lib/$(PYTHONDLL)
-	cp ${NAN_PYTHON}/lib/$(PYTHONDLL) .
-	sed s/PYTHON22\.DLL/$(PYTHONDLL)/ python.def > $(PYTHONDLL).def
-	dlltool.exe -v --output-lib ${NAN_PYTHON}/lib/freepy.a \
-		--input-def $(PYTHONDLL).def \
-		--dllname $(PYTHONDLL)
-	ranlib ${NAN_PYTHON}/lib/freepy.a
-	rm ./$(PYTHONDLL)
-
 clean:
-	$(RM) ${NAN_PYTHON}/lib/freepy.a ${NAN_GETTEXT}/lib/freegettext.a \
+	$(RM) ${NAN_GETTEXT}/lib/freegettext.a \
 		${NAN_ICONV}/lib/freeiconv.a

Modified: trunk/blender/source/gameengine/GamePlayer/common/windows/Makefile
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/common/windows/Makefile	2009-04-15 16:16:00 UTC (rev 19739)
+++ trunk/blender/source/gameengine/GamePlayer/common/windows/Makefile	2009-04-15 16:23:13 UTC (rev 19740)
@@ -50,6 +50,7 @@
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_BMFONT)/include
 CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
+CPPFLAGS += -I$(NAN_GLEW)/include
 
 # Blender stuff
 CPPFLAGS += -I$(SRCHOME)/blender/blenkernel

Modified: trunk/blender/source/nan_definitions.mk
===================================================================
--- trunk/blender/source/nan_definitions.mk	2009-04-15 16:16:00 UTC (rev 19739)
+++ trunk/blender/source/nan_definitions.mk	2009-04-15 16:23:13 UTC (rev 19740)
@@ -516,7 +516,7 @@
     ifeq ($(FREE_WINDOWS), true)
       export NAN_GETTEXT_LIB ?= $(NAN_GETTEXT)/lib/freegettext.a $(NAN_ICONV)/lib/freeiconv.a
       export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
-      export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/freepy.a
+      export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/lib25_vs2005/libpython25.a
       export NAN_FREETYPE ?= $(LCGDIR)/gcc/freetype
       export NAN_ODE ?= $(LCGDIR)/gcc/ode
       export NAN_SDL ?= $(LCGDIR)/gcc/sdl