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:
Diffstat (limited to 'extern/glew')
-rw-r--r--extern/glew/CMakeLists.txt7
-rw-r--r--extern/glew/SConscript2
-rw-r--r--extern/glew/make/msvc_9_0/glew.vcproj1
3 files changed, 8 insertions, 2 deletions
diff --git a/extern/glew/CMakeLists.txt b/extern/glew/CMakeLists.txt
index 53ef014927c..26d10a6ca9f 100644
--- a/extern/glew/CMakeLists.txt
+++ b/extern/glew/CMakeLists.txt
@@ -26,8 +26,13 @@
SET(INC include src)
+IF(UNIX)
+ SET(INC ${INC} ${X11_X11_INCLUDE_PATH})
+ENDIF(UNIX)
+
SET(SRC
- src/glew.c
+ src/glew.c
)
BLENDERLIB(extern_glew "${SRC}" "${INC}")
+
diff --git a/extern/glew/SConscript b/extern/glew/SConscript
index b83525daffe..81a2fc67ccc 100644
--- a/extern/glew/SConscript
+++ b/extern/glew/SConscript
@@ -9,4 +9,4 @@ sources = ['src/glew.c']
defs = ''
incs = 'include'
-env.BlenderLib ( 'extern_glew', sources, Split(incs), Split(defs), libtype=['extern'], priority=[50])
+env.BlenderLib ( 'extern_glew', sources, Split(incs), Split(defs), libtype=['extern','player'], priority=[50,230])
diff --git a/extern/glew/make/msvc_9_0/glew.vcproj b/extern/glew/make/msvc_9_0/glew.vcproj
index f9d8df478ca..a7186f61cbc 100644
--- a/extern/glew/make/msvc_9_0/glew.vcproj
+++ b/extern/glew/make/msvc_9_0/glew.vcproj
@@ -112,6 +112,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"