Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--source/Makefile8
2 files changed, 4 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index e3758ce55f0..8cca8f2a6d1 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ MAKEFLAGS=-I$(NANBLENDERHOME)/source --no-print-directory
SOURCEDIR = blender
ifeq ($(FREE_WINDOWS),true)
- DIRS ?= dlltool intern source po
+ DIRS ?= dlltool extern intern source po
endif
DIRS ?= extern intern source po
diff --git a/source/Makefile b/source/Makefile
index c558a374be9..c4e8140818a 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -110,11 +110,9 @@ ifneq ($(NAN_NO_KETSJI),true)
COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a
COMLIB += $(OCGDIR)/gameengine/ketsji/$(DEBUG_DIR)libketsji.a
COMLIB += $(NAN_SOLID)/lib/libsolid.a
- ifneq ($(FREE_WINDOWS), true)
- COMLIB += $(NAN_SOLID)/lib/libsolid_broad.a
- COMLIB += $(NAN_SOLID)/lib/libsolid_complex.a
- COMLIB += $(NAN_SOLID)/lib/libsolid_convex.a
- endif
+ COMLIB += $(NAN_SOLID)/lib/libsolid_broad.a
+ COMLIB += $(NAN_SOLID)/lib/libsolid_complex.a
+ COMLIB += $(NAN_SOLID)/lib/libsolid_convex.a
COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
COMLIB += $(OCGDIR)/gameengine/blphys/fuzzics/$(DEBUG_DIR)libfuzzics.a
COMLIB += $(NAN_QHULL)/lib/libqhull.a