pthreads for Makefiles/cygwin (don't forget to update lib/windows).
This commit is contained in:
		@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user