pthreads for Makefiles/cygwin (don't forget to update lib/windows).
authorChris Want <cwant@ualberta.ca>
Mon, 27 Feb 2006 00:03:18 +0000 (00:03 +0000)
committerChris Want <cwant@ualberta.ca>
Mon, 27 Feb 2006 00:03:18 +0000 (00:03 +0000)
source/Makefile
source/blender/blenlib/intern/Makefile
source/nan_definitions.mk

index cc679b2ddda73906380245cc21d1b5fffaa87732..f31bad66f82c652a1e4e91acbadda9bb737b395e 100644 (file)
@@ -212,6 +212,7 @@ endif
 ifeq ($(OS), windows)
     ifeq ($(FREE_WINDOWS), true)
         COMLIB += $(NAN_SDL)/lib/libSDL.a
+        COMLIB += $(NAN_PTHREADS)/lib/libpthreadGC2.a
     else
         COMLIB += $(NAN_SDL)/lib/SDL.lib
     endif
index c0db58cdb24f2f87225c70fe7a2ce82d31f2324a..0c3f4a486bebbee41c9e2db481a34f33e8ad2251 100644 (file)
@@ -56,9 +56,10 @@ CPPFLAGS += -I$(SRCHOME)/blender/blenkernel
 CPPFLAGS += -I../../include/
 # path to zlib
 CPPFLAGS += -I$(NAN_ZLIB)/include
-# path to sdl for threads
-CPPFLAGS += $(NAN_SDLCFLAGS)
 
+ifdef NAN_PTHREADS
+  CPPFLAGS += -I$(NAN_PTHREADS)/include
+endif
 ifeq ($(WITH_FREETYPE2), true)
        CPPFLAGS += -DWITH_FREETYPE2
 endif
index 5b7ff8e299e4e6d5cfa0e3dc60a3727b874f14d4..d0b6c953e0786dd78985ae738dea5d27ae37dfc7 100644 (file)
@@ -100,6 +100,7 @@ endif
     export WITH_OPENEXR ?= true
     ifeq ($(OS),windows)
       ifeq ($(FREE_WINDOWS), true)
+        export NAN_PTHREADS ?= $(LCGDIR)/pthreads
         export NAN_OPENEXR ?= $(LCGDIR)/gcc/openexr
         export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a
         export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR