svn merge -r 12684:12691 https://svn.blender.org/svnroot/bf-blender/trunk/blender

[blender.git] / extern / verse / Makefile

diff --git a/extern/verse/Makefile b/extern/verse/Makefile
index 91ab4d26eaa2530054d2c598b30c7675b98d2467..2e88ee2223f55a1dc659a41b00fec9459e1cab26 100644 (file)
--- a/extern/verse/Makefile
+++ b/extern/verse/Makefile
@@ -34,6 +34,7 @@ DIR = $(OCGDIR)/$(SOURCEDIR)
 DIRS = dist
 
 include nan_subdirs.mk
 DIRS = dist
 
 include nan_subdirs.mk

+include nan_compile.mk

 include nan_link.mk
 
 DISTDIR = dist
 include nan_link.mk
 
 DISTDIR = dist


@@ -53,5 +54,5 @@ install: all debug
 ifeq ($(OS),darwin)
        ranlib $(NAN_VERSE)/lib/libverse.a
 endif
 ifeq ($(OS),darwin)
        ranlib $(NAN_VERSE)/lib/libverse.a
 endif

-       $(CC) $(LDFLAGS) -o $(DIR)/verse$(EXT) $(DIR)/libverse.a $(LIBS) $(SLIBS) $(LLIBS) $(DADD) $(LOPTS)
+       $(CCC) $(LDFLAGS) -o $(DIR)/verse$(EXT) $(DIR)/libverse.a $(LIBS) $(SLIBS) $(LLIBS) $(DADD) $(LOPTS)

        @$(CP) $(DIR)/verse$(EXT) $(OCGDIR)/bin
        @$(CP) $(DIR)/verse$(EXT) $(OCGDIR)/bin