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:
authorCampbell Barton <ideasman42@gmail.com>2008-09-25 12:41:11 +0400
committerCampbell Barton <ideasman42@gmail.com>2008-09-25 12:41:11 +0400
commit6d7fe877674348a0a6a7e2edf869187369689c5e (patch)
tree3f75d25539000e13619fa19e34ac3be8a1bf4694 /source/creator
parent718e2bf74f0ba2dcabe5bee7d88c1975ecfe9f06 (diff)
binreloc include was wrong for make, removed last YESIAMSTUPID
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/CMakeLists.txt4
-rw-r--r--source/creator/Makefile6
2 files changed, 1 insertions, 9 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 93cc0e8afb5..99e8b576412 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -54,10 +54,6 @@ IF(LINUX)
INCLUDE_DIRECTORIES(${BINRELOC_INC})
endif(LINUX)
-IF(YESIAMSTUPID)
- ADD_DEFINITIONS(-DYESIAMSTUPID)
-ENDIF(YESIAMSTUPID)
-
MESSAGE(STATUS "Configuring blender")
ADD_CUSTOM_COMMAND(
diff --git a/source/creator/Makefile b/source/creator/Makefile
index 158aee1a647..9273d943883 100644
--- a/source/creator/Makefile
+++ b/source/creator/Makefile
@@ -60,11 +60,7 @@ ifeq ($(WITH_QUICKTIME), true)
endif
ifeq ($(WITH_BINRELOC), true)
- CPPFLAGS += -I$(OCGDIR)/extern/binreloc/include -DWITH_BINRELOC
-endif
-
-ifeq ($(NAN_YESIAMSTUPID), true)
- CPPFLAGS += -DYESIAMSTUPID
+ CPPFLAGS += -I$(NANBLENDERHOME)/extern/binreloc/include -DWITH_BINRELOC
endif
CPPFLAGS += -I$(OPENGL_HEADERS)