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:
authorAntony Riakiotakis <kalast@gmail.com>2013-04-02 17:07:01 +0400
committerAntony Riakiotakis <kalast@gmail.com>2013-04-02 17:07:01 +0400
commitdbfadcad610c6ee10b57759db05f75d26dc18987 (patch)
treee8af25441b84ee5c1df96cd52fcaed525165f55e /source/blender/editors/util
parent5105ddae74d47c883dfef2a76ac43d6bac4e74da (diff)
Fix compilation on MinGW(64/32)
Also, add appropriate lib paths for recent OpenCollada for mingw32 (coming soon to an svn server near you)
Diffstat (limited to 'source/blender/editors/util')
-rw-r--r--source/blender/editors/util/CMakeLists.txt2
-rw-r--r--source/blender/editors/util/SConscript2
2 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt
index 53c23a8f853..bcc55c4ea6e 100644
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -90,6 +90,8 @@ set(SRC
../include/UI_view2d.h
)
+add_definitions(-DGLEW_STATIC)
+
if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
diff --git a/source/blender/editors/util/SConscript b/source/blender/editors/util/SConscript
index 1c1a8e46dd7..8460b307f0d 100644
--- a/source/blender/editors/util/SConscript
+++ b/source/blender/editors/util/SConscript
@@ -28,7 +28,7 @@
Import ('env')
sources = env.Glob('*.c')
-defs = []
+defs = [ 'GLEW_STATIC' ]
incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'