Menu
▾
▴
glean-patches — Notifications of changes to the glean CVS tree are sent to this list.
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
(4) |
Oct
(24) |
Nov
(28) |
Dec
(40) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(11) |
Feb
(1) |
Mar
(4) |
Apr
(13) |
May
(11) |
Jun
(6) |
Jul
(8) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2002 |
Jan
|
Feb
(1) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(9) |
Dec
(1) |
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
(1) |
Dec
|
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
(2) |
Nov
(1) |
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
(22) |
Nov
(4) |
Dec
(1) |
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(1) |
Jul
|
Aug
(7) |
Sep
(21) |
Oct
(15) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
(1) |
Mar
(33) |
Apr
(11) |
May
(10) |
Jun
|
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(1) |
Nov
(11) |
Dec
(4) |
| 2008 |
Jan
(2) |
Feb
(3) |
Mar
(6) |
Apr
(1) |
May
|
Jun
(2) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(7) |
| 2009 |
Jan
(24) |
Feb
(49) |
Mar
(42) |
Apr
(22) |
May
(4) |
Jun
(73) |
Jul
(7) |
Aug
(3) |
Sep
(11) |
Oct
(1) |
Nov
(1) |
Dec
(21) |
| 2010 |
Jan
(2) |
Feb
(18) |
Mar
(1) |
Apr
(1) |
May
|
Jun
|
Jul
(3) |
Aug
(5) |
Sep
(6) |
Oct
(1) |
Nov
(3) |
Dec
(2) |
| 2011 |
Jan
(7) |
Feb
(3) |
Mar
|
Apr
(2) |
May
(1) |
Jun
|
Jul
(18) |
Aug
|
Sep
(1) |
Oct
(1) |
Nov
(1) |
Dec
|
| 2012 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Jose F. <jrf...@us...> - 2013-03-15 11:38:12
|
Module: glean Branch: master Commit: 977ef20c1cce4d48b3863880bfeb6c4e1ee9c151 URL: no.cgit.repo/commit/?id=977ef20c1cce4d48b3863880bfeb6c4e1ee9c151 Author: José Fonseca <jfo...@vm...> Date: Fri Mar 15 11:37:15 2013 +0000 cmake: Use static MSVC runtime. Therefore avoiding to have to install the MSVC runtime redistributables. --- src/CMakeLists.txt | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d421fbd..d4bc572 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -38,6 +38,17 @@ else () add_definitions (-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS) add_definitions (-D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS) + + # Use static runtime + # http://www.cmake.org/Wiki/CMake_FAQ#How_can_I_build_my_MSVC_application_with_a_static_runtime.3F + foreach (flag_var + CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO + CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO + ) + if (${flag_var} MATCHES "/MD") + string (REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") + endif () + endforeach (flag_var) endif () if (MINGW) |
|
From: Jose F. <jrf...@us...> - 2013-03-15 11:38:11
|
Module: glean
Branch: master
Commit: 9396bfb44d16ae68c52e1e2efd2249408a78ffd3
URL: no.cgit.repo/commit/?id=9396bfb44d16ae68c52e1e2efd2249408a78ffd3
Author: José Fonseca <jfo...@vm...>
Date: Tue May 22 19:51:31 2012 +0100
cmake: Avoid depending on MinGW runtime DLLs.
---
src/CMakeLists.txt | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 384f6c3..d421fbd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -40,6 +40,22 @@ else ()
add_definitions (-D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS)
endif ()
+if (MINGW)
+ # Avoid depending on MinGW runtime DLLs
+ check_cxx_compiler_flag (-static-libgcc HAVE_STATIC_LIBGCC_FLAG)
+ if (HAVE_STATIC_LIBGCC_FLAG)
+ set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc")
+ set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-libgcc")
+ set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -static-libgcc")
+ endif ()
+ check_cxx_compiler_flag (-static-libstdc++ HAVE_STATIC_LIBSTDCXX_FLAG)
+ if (HAVE_STATIC_LIBSTDCXX_FLAG)
+ set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++")
+ set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-libstdc++")
+ set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -static-libstdc++")
+ endif ()
+endif ()
+
if (APPLE)
# We rely on frameworks which where deprecated on x86-64
set (CMAKE_OSX_ARCHITECTURES i386)
|
|
From: Jose F. <jrf...@us...> - 2013-03-15 11:38:10
|
Module: glean Branch: master Commit: f5a78fc45a3aa19597232945e74194ddb5d2113a URL: no.cgit.repo/commit/?id=f5a78fc45a3aa19597232945e74194ddb5d2113a Author: José Fonseca <jfo...@vm...> Date: Wed Apr 25 08:59:30 2012 +0100 glean: Add missing stdlib.h include for system() call. Include is necessary when building with WIN32_LEAN_AND_MEAN. --- src/glean/environ.cpp | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/glean/environ.cpp b/src/glean/environ.cpp index 050d9da..b8af554 100644 --- a/src/glean/environ.cpp +++ b/src/glean/environ.cpp @@ -44,6 +44,7 @@ #elif defined(__MS__) #include <stdio.h> +#include <stdlib.h> #include <sys/stat.h> #endif |
|
From: Jose F. <jrf...@us...> - 2012-10-31 16:38:50
|
Module: glean
Branch: master
Commit: 5c2944a4ec8d894a0718497d2a03c2ea2c9b9eea
URL: no.cgit.repo/commit/?id=5c2944a4ec8d894a0718497d2a03c2ea2c9b9eea
Author: José Fonseca <jos...@gm...>
Date: Tue Oct 30 19:41:44 2012 +0000
Test glStencilMaskSeparate too.
Reviewed-by: Brian Paul <br...@vm...>
---
src/glean/tstencil2.cpp | 154 ++++++++++++++++++++++++++++++++++++++++-------
src/glean/tstencil2.h | 19 ++++++-
2 files changed, 151 insertions(+), 22 deletions(-)
diff --git a/src/glean/tstencil2.cpp b/src/glean/tstencil2.cpp
index 7db3a06..9440c6f 100644
--- a/src/glean/tstencil2.cpp
+++ b/src/glean/tstencil2.cpp
@@ -280,8 +280,12 @@ Stencil2Test::set_stencil_state(int method,
GLenum backZPass,
GLenum frontFunc,
GLenum backFunc,
- GLint ref,
- GLuint mask)
+ GLint frontRef,
+ GLint backRef,
+ GLuint frontMask,
+ GLuint backMask,
+ GLuint frontWriteMask,
+ GLuint backWriteMask)
{
GLint get_frontStencilFail;
GLint get_backStencilFail;
@@ -291,12 +295,20 @@ Stencil2Test::set_stencil_state(int method,
GLint get_backZPass;
GLint get_frontFunc;
GLint get_backFunc;
- GLint get_ref;
- GLint get_mask;
+ GLint get_frontRef;
+ GLint get_backRef;
+ GLint get_frontMask;
+ GLint get_backMask;
+ GLint get_frontWriteMask;
+ GLint get_backWriteMask;
GLint twoEnabled;
switch (method) {
case ATI:
+ assert(frontRef == backRef);
+ assert(frontMask == backMask);
+ assert(frontWriteMask == backWriteMask);
+
// set state
glStencilOpSeparateATI_func(GL_FRONT,
frontStencilFail,
@@ -308,20 +320,26 @@ Stencil2Test::set_stencil_state(int method,
backZFail,
backZPass);
- glStencilFuncSeparateATI_func(frontFunc, backFunc, ref, mask);
+ glStencilFuncSeparateATI_func(frontFunc, backFunc, frontRef, frontMask);
+
+ glStencilMask(frontWriteMask);
// get state
glGetIntegerv(GL_STENCIL_FAIL, &get_frontStencilFail);
glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &get_frontZFail);
glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &get_frontZPass);
glGetIntegerv(GL_STENCIL_FUNC, &get_frontFunc);
- glGetIntegerv(GL_STENCIL_REF, &get_ref);
- glGetIntegerv(GL_STENCIL_VALUE_MASK, &get_mask);
+ glGetIntegerv(GL_STENCIL_REF, &get_frontRef);
+ glGetIntegerv(GL_STENCIL_VALUE_MASK, &get_frontMask);
+ glGetIntegerv(GL_STENCIL_WRITEMASK, &get_frontWriteMask);
glGetIntegerv(GL_STENCIL_BACK_FUNC_ATI, &get_backFunc);
glGetIntegerv(GL_STENCIL_BACK_FAIL_ATI, &get_backStencilFail);
glGetIntegerv(GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI, &get_backZFail);
glGetIntegerv(GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI, &get_backZPass);
+ get_backRef = get_frontRef;
+ get_backMask = get_frontMask;
+ get_backWriteMask = get_frontWriteMask;
twoEnabled = GL_TRUE;
break;
@@ -331,11 +349,13 @@ Stencil2Test::set_stencil_state(int method,
glActiveStencilFaceEXT_func(GL_FRONT);
glStencilOp(frontStencilFail, frontZFail, frontZPass);
- glStencilFunc(frontFunc, ref, mask);
+ glStencilFunc(frontFunc, frontRef, frontMask);
+ glStencilMask(frontWriteMask);
glActiveStencilFaceEXT_func(GL_BACK);
glStencilOp(backStencilFail, backZFail, backZPass);
- glStencilFunc(backFunc, ref, mask);
+ glStencilFunc(backFunc, backRef, backMask);
+ glStencilMask(backWriteMask);
// get state
glActiveStencilFaceEXT_func(GL_FRONT);
@@ -343,15 +363,17 @@ Stencil2Test::set_stencil_state(int method,
glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &get_frontZFail);
glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &get_frontZPass);
glGetIntegerv(GL_STENCIL_FUNC, &get_frontFunc);
- glGetIntegerv(GL_STENCIL_REF, &get_ref);
- glGetIntegerv(GL_STENCIL_VALUE_MASK, &get_mask);
+ glGetIntegerv(GL_STENCIL_REF, &get_frontRef);
+ glGetIntegerv(GL_STENCIL_VALUE_MASK, &get_frontMask);
+ glGetIntegerv(GL_STENCIL_WRITEMASK, &get_frontWriteMask);
glActiveStencilFaceEXT_func(GL_BACK);
glGetIntegerv(GL_STENCIL_FAIL, &get_backStencilFail);
glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &get_backZFail);
glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &get_backZPass);
glGetIntegerv(GL_STENCIL_FUNC, &get_backFunc);
- glGetIntegerv(GL_STENCIL_REF, &get_ref);
- glGetIntegerv(GL_STENCIL_VALUE_MASK, &get_mask);
+ glGetIntegerv(GL_STENCIL_REF, &get_backRef);
+ glGetIntegerv(GL_STENCIL_VALUE_MASK, &get_backMask);
+ glGetIntegerv(GL_STENCIL_WRITEMASK, &get_backWriteMask);
glGetIntegerv(GL_STENCIL_TEST_TWO_SIDE_EXT, &twoEnabled);
break;
@@ -365,21 +387,27 @@ Stencil2Test::set_stencil_state(int method,
backStencilFail,
backZFail,
backZPass);
- glStencilFuncSeparate_func(GL_FRONT, frontFunc, ref, mask);
- glStencilFuncSeparate_func(GL_BACK, backFunc, ref, mask);
+ glStencilFuncSeparate_func(GL_FRONT, frontFunc, frontRef, frontMask);
+ glStencilFuncSeparate_func(GL_BACK, backFunc, backRef, backMask);
+ glStencilMaskSeparate_func(GL_FRONT, frontWriteMask);
+ glStencilMaskSeparate_func(GL_BACK, backWriteMask);
// get state
glGetIntegerv(GL_STENCIL_FAIL, &get_frontStencilFail);
glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &get_frontZFail);
glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &get_frontZPass);
glGetIntegerv(GL_STENCIL_FUNC, &get_frontFunc);
- glGetIntegerv(GL_STENCIL_REF, &get_ref);
- glGetIntegerv(GL_STENCIL_VALUE_MASK, &get_mask);
+ glGetIntegerv(GL_STENCIL_REF, &get_frontRef);
+ glGetIntegerv(GL_STENCIL_VALUE_MASK, &get_frontMask);
+ glGetIntegerv(GL_STENCIL_WRITEMASK, &get_frontWriteMask);
glGetIntegerv(GL_STENCIL_BACK_FUNC, &get_backFunc);
glGetIntegerv(GL_STENCIL_BACK_FAIL, &get_backStencilFail);
glGetIntegerv(GL_STENCIL_BACK_PASS_DEPTH_FAIL, &get_backZFail);
glGetIntegerv(GL_STENCIL_BACK_PASS_DEPTH_PASS, &get_backZPass);
+ glGetIntegerv(GL_STENCIL_BACK_REF, &get_backRef);
+ glGetIntegerv(GL_STENCIL_BACK_VALUE_MASK, &get_backMask);
+ glGetIntegerv(GL_STENCIL_BACK_WRITEMASK, &get_backWriteMask);
twoEnabled = GL_TRUE;
break;
@@ -388,8 +416,14 @@ Stencil2Test::set_stencil_state(int method,
}
// mask off bits we don't care about
- get_mask &= stencilMax;
- mask &= stencilMax;
+ get_frontMask &= stencilMax;
+ frontMask &= stencilMax;
+ get_backMask &= stencilMax;
+ backMask &= stencilMax;
+ get_frontWriteMask &= stencilMax;
+ frontWriteMask &= stencilMax;
+ get_backWriteMask &= stencilMax;
+ backWriteMask &= stencilMax;
GLenum err = glGetError();
if (err != GL_NO_ERROR) {
@@ -432,10 +466,28 @@ Stencil2Test::set_stencil_state(int method,
"back stencil func"))
return false;
- if (!compare_state(method, get_ref, ref, "stencil ref"))
+ if (!compare_state(method, get_frontRef, frontRef,
+ "front stencil ref"))
+ return false;
+
+ if (!compare_state(method, get_backRef, backRef,
+ "back stencil ref"))
+ return false;
+
+ if (!compare_state(method, get_frontMask, frontMask,
+ "front stencil mask"))
return false;
- if (!compare_state(method, get_mask, mask, "stencil mask"))
+ if (!compare_state(method, get_backMask, backMask,
+ "back stencil mask"))
+ return false;
+
+ if (!compare_state(method, get_frontWriteMask, frontWriteMask,
+ "front stencil writemask"))
+ return false;
+
+ if (!compare_state(method, get_backWriteMask, backWriteMask,
+ "back stencil writemask"))
return false;
if (!compare_state(method, twoEnabled, GL_TRUE, "two-side enable"))
@@ -445,6 +497,38 @@ Stencil2Test::set_stencil_state(int method,
}
+bool
+Stencil2Test::set_stencil_state(int method,
+ GLenum frontStencilFail,
+ GLenum backStencilFail,
+ GLenum frontZFail,
+ GLenum backZFail,
+ GLenum frontZPass,
+ GLenum backZPass,
+ GLenum frontFunc,
+ GLenum backFunc,
+ GLint ref,
+ GLuint mask,
+ GLuint writeMask)
+{
+ return set_stencil_state(method,
+ frontStencilFail,
+ backStencilFail,
+ frontZFail,
+ backZFail,
+ frontZPass,
+ backZPass,
+ frontFunc,
+ backFunc,
+ ref, // frontRef
+ ref, // backRef
+ mask, // frontMask
+ mask, // backMask
+ writeMask, // frontWriteMask
+ writeMask); // backWriteMask
+}
+
+
void
Stencil2Test::reset_stencil_state(int method)
{
@@ -535,6 +619,34 @@ Stencil2Test::test_stencil(int method)
if (!pass)
return false;
+ if (method != ATI) {
+ // if front!=10, keep, else decr
+ // if back<10, keep, else incr
+ // final: front=6, back=1
+ pass = set_stencil_state(method,
+ GL_DECR, GL_INCR, // stencil fail
+ GL_KEEP, GL_KEEP, // z fail
+ GL_REPLACE, GL_REPLACE, // z pass
+ GL_ALWAYS, GL_ALWAYS, // stencil func
+ 0xf6, 0xf1, // ref
+ 0xff, 0xff, // mask
+ 0x60, 0x10); // writeMask
+ if (pass)
+ pass = render_test(0x66, 0x11);
+ reset_stencil_state(method);
+ if (!pass)
+ return false;
+ }
+
+ // reset write mask for clear
+ set_stencil_state(method,
+ GL_KEEP, GL_KEEP, // stencil fail
+ GL_KEEP, GL_KEEP, // z fail
+ GL_REPLACE, GL_REPLACE, // z pass
+ GL_ALWAYS, GL_ALWAYS, // stencil func
+ 0, 0,
+ ~0, ~0,
+ ~0, ~0);
//============================================================
// Now begin tests with depth test
diff --git a/src/glean/tstencil2.h b/src/glean/tstencil2.h
index 8c332cd..cd6da7f 100644
--- a/src/glean/tstencil2.h
+++ b/src/glean/tstencil2.h
@@ -80,8 +80,25 @@ private:
GLenum backZPass,
GLenum frontFunc,
GLenum backFunc,
+ GLint frontRef,
+ GLint backRef,
+ GLuint frontMask,
+ GLuint backMask,
+ GLuint frontWriteMask,
+ GLuint backWriteMask);
+
+ bool set_stencil_state(int method,
+ GLenum frontStencilFail,
+ GLenum backStencilFail,
+ GLenum frontZFail,
+ GLenum backZFail,
+ GLenum frontZPass,
+ GLenum backZPass,
+ GLenum frontFunc,
+ GLenum backFunc,
GLint ref,
- GLuint mask);
+ GLuint mask,
+ GLuint writeMask = ~0);
void reset_stencil_state(int method);
|
|
From: Brian P. <br...@us...> - 2012-01-02 21:30:49
|
Module: glean
Branch: master
Commit: b84d22238b6a4b0b46c72bc693a62ae3a7b0b78e
URL: no.cgit.repo/commit/?id=b84d22238b6a4b0b46c72bc693a62ae3a7b0b78e
Author: Nicholas Miell <nm...@gm...>
Date: Mon Jan 2 14:28:45 2012 -0700
Release GLX context before destroying the window
GLEAN::Window::~Window was calling XDestroyWindow on the currently
bound GLX drawable, which would cause the subsequent test to explode
when it called glXMakeCurrent and Mesa attempted to flush the
outstanding state to the now destroyed window.
Now the Window destructor checks if the window being destroyed is
bound to the current GLX context, and if so, releases the current GLX
context before destroying the window.
I also included the equivalent WGL change, but that is untested.
The AGL and BeOS versions are untouched, but probably needs something
similar.
With this change, the glean basic sanity test now passes on Mesa swrast.
Signed-off-by: Nicholas Miell <nm...@gm...>
Signed-off-by: Brian Paul <br...@vm...>
---
src/glean/dsurf.cpp | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/glean/dsurf.cpp b/src/glean/dsurf.cpp
index 84e4fda..8aa1e67 100644
--- a/src/glean/dsurf.cpp
+++ b/src/glean/dsurf.cpp
@@ -188,8 +188,12 @@ DrawingSurface::commonDestructorCode() {
Window::~Window() {
#if defined(__X11__)
+ if (glXGetCurrentDrawable() == xWindow)
+ glXMakeCurrent(winSys->dpy, None, NULL);
XDestroyWindow(winSys->dpy, xWindow);
#elif defined(__WIN__)
+ if (wglGetCurrentDC() == hDC)
+ wglMakeCurrent(NULL, NULL);
ReleaseDC(hWindow,hDC);
DestroyWindow(hWindow);
|
|
From: Jose F. <jrf...@us...> - 2011-11-02 20:37:36
|
Module: glean
Branch: master
Commit: f6d1f5dfe0421c15cf38ff49c67ded8f9f7dc63a
URL: no.cgit.repo/commit/?id=f6d1f5dfe0421c15cf38ff49c67ded8f9f7dc63a
Author: Morgan Armand <mor...@gm...>
Date: Wed Nov 2 08:30:35 2011 +0100
glean: Fix handling of PIXELFORMATDESCRIPTORs.
Signed-off-by: José Fonseca <jfo...@vm...>
---
src/glean/dsurf.cpp | 3 +--
src/glean/rc.cpp | 4 +---
src/libs/dsurf/dsconfig.cpp | 42 +++++++++++++++++++++---------------------
src/libs/dsurf/dsconfig.h | 2 +-
4 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/src/glean/dsurf.cpp b/src/glean/dsurf.cpp
index f158921..84e4fda 100644
--- a/src/glean/dsurf.cpp
+++ b/src/glean/dsurf.cpp
@@ -145,8 +145,7 @@ legacyMethod:
hDC = GetDC(hWindow);
- PIXELFORMATDESCRIPTOR pfd;
- SetPixelFormat(hDC,config->pfdID,&pfd);
+ SetPixelFormat(hDC,config->pfdID,&config->pfd);
#elif defined(__BEWIN__)
diff --git a/src/glean/rc.cpp b/src/glean/rc.cpp
index 8cc95b3..e432d99 100644
--- a/src/glean/rc.cpp
+++ b/src/glean/rc.cpp
@@ -66,9 +66,7 @@ HGLRC create_context(GLEAN::DrawingSurfaceConfig &c)
if (!hDC)
return 0;
- PIXELFORMATDESCRIPTOR pfd;
-
- if (!SetPixelFormat(hDC,c.pfdID,&pfd))
+ if (!SetPixelFormat(hDC,c.pfdID,&c.pfd))
{
ReleaseDC(hwnd,hDC);
DestroyWindow(hwnd);
diff --git a/src/libs/dsurf/dsconfig.cpp b/src/libs/dsurf/dsconfig.cpp
index 25a4f25..ff559fc 100644
--- a/src/libs/dsurf/dsconfig.cpp
+++ b/src/libs/dsurf/dsconfig.cpp
@@ -367,48 +367,48 @@ DrawingSurfaceConfig::DrawingSurfaceConfig(int id, ::PIXELFORMATDESCRIPTOR *ppfd
if (!mapsInitialized)
initializeMaps();
- pfd = ppfd;
+ pfd = *ppfd;
pfdID = id;
- canRGBA = pfd->iPixelType == PFD_TYPE_RGBA;
- canCI = pfd->iPixelType == PFD_TYPE_COLORINDEX;
+ canRGBA = pfd.iPixelType == PFD_TYPE_RGBA;
+ canCI = pfd.iPixelType == PFD_TYPE_COLORINDEX;
- bufSize = pfd->cColorBits + pfd->cAlphaBits;
+ bufSize = pfd.cColorBits + pfd.cAlphaBits;
level = 0;
- db = pfd->dwFlags & PFD_DOUBLEBUFFER;
+ db = pfd.dwFlags & PFD_DOUBLEBUFFER;
- stereo = pfd->dwFlags & PFD_STEREO;
+ stereo = pfd.dwFlags & PFD_STEREO;
- aux = pfd->cAuxBuffers;
+ aux = pfd.cAuxBuffers;
if (canRGBA) {
- r = pfd->cRedBits;
- g = pfd->cGreenBits;
- b = pfd->cBlueBits;
- a = pfd->cAlphaBits;
+ r = pfd.cRedBits;
+ g = pfd.cGreenBits;
+ b = pfd.cBlueBits;
+ a = pfd.cAlphaBits;
}
else
r = g = b = a = 0;
- z = pfd->cDepthBits;
- s = pfd->cStencilBits;
+ z = pfd.cDepthBits;
+ s = pfd.cStencilBits;
- accR = pfd->cAccumRedBits;
- accG = pfd->cAccumGreenBits;
- accB = pfd->cAccumBlueBits;
- accA = pfd->cAccumAlphaBits;
+ accR = pfd.cAccumRedBits;
+ accG = pfd.cAccumGreenBits;
+ accB = pfd.cAccumBlueBits;
+ accA = pfd.cAccumAlphaBits;
samples = 0; // XXX implement properly for Windows!
- canWindow = pfd->dwFlags & PFD_DRAW_TO_WINDOW;
+ canWindow = pfd.dwFlags & PFD_DRAW_TO_WINDOW;
- canWinSysRender = pfd->dwFlags & PFD_SUPPORT_GDI;
+ canWinSysRender = pfd.dwFlags & PFD_SUPPORT_GDI;
- if (pfd->dwFlags & PFD_GENERIC_FORMAT)
+ if (pfd.dwFlags & PFD_GENERIC_FORMAT)
{
- if (pfd->dwFlags & PFD_GENERIC_ACCELERATED)
+ if (pfd.dwFlags & PFD_GENERIC_ACCELERATED)
{
// it's an MCD - at least it has some acceleration
fast = true;
diff --git a/src/libs/dsurf/dsconfig.h b/src/libs/dsurf/dsconfig.h
index 3827662..8df2abc 100644
--- a/src/libs/dsurf/dsconfig.h
+++ b/src/libs/dsurf/dsconfig.h
@@ -93,7 +93,7 @@ class DrawingSurfaceConfig {
::XID fbcID; // Framebuffer Config ID.
# endif
# elif defined(__WIN__)
- ::PIXELFORMATDESCRIPTOR *pfd;
+ ::PIXELFORMATDESCRIPTOR pfd;
int pfdID;
# elif defined(__AGL__)
AGLPixelFormat pf;
|
|
From: Brian P. <br...@us...> - 2011-10-18 19:28:14
|
Module: glean
Branch: master
Commit: 3e31dc7d602def24821469d37b0b37ff162f1a30
URL: no.cgit.repo/commit/?id=3e31dc7d602def24821469d37b0b37ff162f1a30
Author: Paul Berry <ste...@gm...>
Date: Tue Oct 18 12:15:07 2011 -0700
Fix too-specific GL version checks
This patch fixes several version checks that are too specific
(e.g. checking that the GL version is 2.x or 3.x when the intent is to
make sure the GL version is >= 2.0).
We now perform the version check using GLUtils::getVersion() function.
Signed-off-by: Brian Paul <br...@vm...>
---
src/glean/tapi2.cpp | 3 +--
src/glean/tshaderapi.cpp | 7 ++-----
src/glean/tstencil2.cpp | 11 ++---------
src/glean/ttexunits.cpp | 8 +++-----
src/glean/tvertarraybgra.cpp | 3 +--
5 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/src/glean/tapi2.cpp b/src/glean/tapi2.cpp
index f180bc3..9a88f9f 100644
--- a/src/glean/tapi2.cpp
+++ b/src/glean/tapi2.cpp
@@ -181,8 +181,7 @@ bool
API2Test::setup(void)
{
// check that we have OpenGL 2.0
- const char *version = (const char *) glGetString(GL_VERSION);
- if (version[0] != '2' || version[1] != '.') {
+ if (GLUtils::getVersion() < 2.0) {
//env->log << "OpenGL 2.0 not supported\n";
return false;
}
diff --git a/src/glean/tshaderapi.cpp b/src/glean/tshaderapi.cpp
index 1769bfd..9c651ba 100644
--- a/src/glean/tshaderapi.cpp
+++ b/src/glean/tshaderapi.cpp
@@ -569,15 +569,12 @@ ShaderAPIResult::getresults(istream &s)
bool
ShaderAPITest::isApplicable() const
{
- const char *version = (const char *) glGetString(GL_VERSION);
- if (strncmp(version, "2.0", 3) == 0 ||
- strncmp(version, "2.1", 3) == 0 ||
- strncmp(version, "3.0", 3) == 0) {
+ if (GLUtils::getVersion() >= 2.0) {
return true;
}
else {
env->log << name
- << ": skipped. Requires GL 2.0, 2.1 or 3.0.\n";
+ << ": skipped. Requires GL >= 2.0.\n";
return false;
}
}
diff --git a/src/glean/tstencil2.cpp b/src/glean/tstencil2.cpp
index d0c783a..7db3a06 100644
--- a/src/glean/tstencil2.cpp
+++ b/src/glean/tstencil2.cpp
@@ -111,20 +111,13 @@ Stencil2Test::have_EXT_stencil_two_side(void) const
bool
Stencil2Test::have_GL2_stencil_two_side(void) const
{
- const char *version = (const char *) glGetString(GL_VERSION);
- if (strncmp(version, "2.", 2) == 0 ||
- strncmp(version, "3.0", 3) == 0) {
- return true;
- }
- return false;
+ return GLUtils::getVersion() >= 2.0;
}
bool
Stencil2Test::have_stencil_wrap(void) const
{
- const char *version = (const char *) glGetString(GL_VERSION);
- if (strncmp(version, "2.", 2) == 0 ||
- strncmp(version, "3.0", 3) == 0) {
+ if (GLUtils::getVersion() >= 2.0) {
return true;
}
else if (GLUtils::haveExtension("GL_EXT_stencil_wrap")) {
diff --git a/src/glean/ttexunits.cpp b/src/glean/ttexunits.cpp
index 309f4be..62dd750 100644
--- a/src/glean/ttexunits.cpp
+++ b/src/glean/ttexunits.cpp
@@ -69,11 +69,9 @@ TexUnitsTest::reportFailure(const char *msg, GLint unit) const
bool
TexUnitsTest::setup(void)
{
- // check that we have OpenGL 2.x or 3.x
- const char *verString = (const char *) glGetString(GL_VERSION);
-
- if (verString[0] != '2' && verString[0] != '3') {
- env->log << "OpenGL 2.x or 3.x not supported\n";
+ // check that we have at least OpenGL 2.0
+ if (GLUtils::getVersion() < 2.0) {
+ env->log << "OpenGL >= 2.0 not supported\n";
return false;
}
diff --git a/src/glean/tvertarraybgra.cpp b/src/glean/tvertarraybgra.cpp
index fede919..05e03bc 100644
--- a/src/glean/tvertarraybgra.cpp
+++ b/src/glean/tvertarraybgra.cpp
@@ -70,8 +70,7 @@ VertArrayBGRATest::testAPI(void)
// Get glVertexAttrib() function
PFNGLVERTEXATTRIBPOINTERARBPROC VertexAttribPointer = NULL;
- const char *version = (const char *) glGetString(GL_VERSION);
- if (version[0] == '2') {
+ if (GLUtils::getVersion() >= 2.0) {
VertexAttribPointer = (PFNGLVERTEXATTRIBPOINTERARBPROC)
GLUtils::getProcAddress("glVertexAttribPointer");
}
|
|
From: Brian P. <br...@us...> - 2011-09-06 17:38:17
|
Module: glean
Branch: master
Commit: 81087864dd3959feabe463d2cacdd99089976945
URL: no.cgit.repo/commit/?id=81087864dd3959feabe463d2cacdd99089976945
Author: Brian Paul <br...@vm...>
Date: Tue Sep 6 11:36:14 2011 -0600
texture_srgb: add int casts to make log message readable
The values were being interpreted as chars before.
---
src/glean/ttexture_srgb.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/glean/ttexture_srgb.cpp b/src/glean/ttexture_srgb.cpp
index 10909c0..a79019c 100644
--- a/src/glean/ttexture_srgb.cpp
+++ b/src/glean/ttexture_srgb.cpp
@@ -128,9 +128,9 @@ TextureSRGBTest::testImageTransfer(void)
env->log << "Expected value at ["
<< j
<< "] should be "
- << image[j]
+ << (int) image[j]
<< " found "
- << image2[j]
+ << (int) image2[j]
<< "\n";
delete [] image;
return false;
|
|
From: Jose F. <jrf...@us...> - 2011-07-17 17:13:42
|
Module: glean Branch: master Commit: c2e4ebf10857108450464330f8ad01c294359ad2 URL: no.cgit.repo/commit/?id=c2e4ebf10857108450464330f8ad01c294359ad2 Author: José Fonseca <jfo...@vm...> Date: Sun Jul 17 10:01:00 2011 -0700 dsurf: #pragma warning is MSVC specific. MinGW doesn't understand it and will produce warnings. --- src/libs/dsurf/dsconfig.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/libs/dsurf/dsconfig.cpp b/src/libs/dsurf/dsconfig.cpp index 6a6df33..25a4f25 100644 --- a/src/libs/dsurf/dsconfig.cpp +++ b/src/libs/dsurf/dsconfig.cpp @@ -37,7 +37,7 @@ #include <map> #include <limits.h> -#ifdef __WIN__ +#ifdef _MSC_VER // disable the annoying warning : "forcing value to bool 'true' or 'false' (performance warning)" #pragma warning (disable : 4800) #endif |
|
From: Jose F. <jrf...@us...> - 2011-07-17 16:35:09
|
Module: glean Branch: master Commit: 19c302331cea544fc66b16a00d411511991a0c08 URL: no.cgit.repo/commit/?id=19c302331cea544fc66b16a00d411511991a0c08 Author: José Fonseca <jfo...@vm...> Date: Fri Jul 15 16:14:00 2011 +0100 Revert "Use static MSVC runtime." Creates havoc when linking against certain libraries. This reverts commit 81469c15be2a5abc49616fd6e51b74dba2b1fbb7. --- src/CMakeLists.txt | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 814fe30..384f6c3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -38,17 +38,6 @@ else () add_definitions (-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS) add_definitions (-D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS) - - # Use static runtime - # http://www.cmake.org/Wiki/CMake_FAQ#How_can_I_build_my_MSVC_application_with_a_static_runtime.3F - foreach (flag_var - CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO - CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO - ) - if (${flag_var} MATCHES "/MD") - string (REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") - endif (${flag_var} MATCHES "/MD") - endforeach (flag_var) endif () if (APPLE) |
|
From: Jose F. <jrf...@us...> - 2011-07-17 16:35:03
|
Module: glean
Branch: master
Commit: 78a8b28ff19e6391763d4da4fce8e47d51b3779b
URL: no.cgit.repo/commit/?id=78a8b28ff19e6391763d4da4fce8e47d51b3779b
Author: José Fonseca <jfo...@vm...>
Date: Fri Jul 15 16:09:17 2011 +0100
Add GLUT include dir only where necessary.
---
src/CMakeLists.txt | 1 -
src/tools/difftiff/CMakeLists.txt | 2 ++
src/tools/showtiff/CMakeLists.txt | 2 ++
3 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cebb8ef..814fe30 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -82,7 +82,6 @@ include_directories (
libs/timer
glh
${GLEXT_INCLUDE_DIR}
- ${GLUT_INCLUDE_DIR}
${OPENGL_INCLUDE_DIR}
${TIFF_INCLUDE_DIR}
)
diff --git a/src/tools/difftiff/CMakeLists.txt b/src/tools/difftiff/CMakeLists.txt
index 1a2e362..0bb72f2 100644
--- a/src/tools/difftiff/CMakeLists.txt
+++ b/src/tools/difftiff/CMakeLists.txt
@@ -1,3 +1,5 @@
+include_directories (${GLUT_INCLUDE_DIR})
+
file (GLOB sources "*.cpp")
add_executable (difftiff ${sources})
diff --git a/src/tools/showtiff/CMakeLists.txt b/src/tools/showtiff/CMakeLists.txt
index c219dd1..009889d 100644
--- a/src/tools/showtiff/CMakeLists.txt
+++ b/src/tools/showtiff/CMakeLists.txt
@@ -1,3 +1,5 @@
+include_directories (${GLUT_INCLUDE_DIR})
+
file (GLOB sources "*.cpp")
add_executable (showtiff ${sources})
|
|
From: Jose F. <jrf...@us...> - 2011-07-17 16:34:59
|
Module: glean
Branch: master
Commit: 84e246932ed8f994c595f57a272e7d34664e509d
URL: no.cgit.repo/commit/?id=84e246932ed8f994c595f57a272e7d34664e509d
Author: José Fonseca <jfo...@vm...>
Date: Fri Jul 15 16:08:50 2011 +0100
Fix MacOSX build.
---
src/CMakeLists.txt | 8 ++++++--
src/tiff/CMakeLists.txt | 2 ++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 217b52a..cebb8ef 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -51,7 +51,10 @@ else ()
endforeach (flag_var)
endif ()
-set (GLEXT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/glext)
+if (APPLE)
+ # We rely on frameworks which where deprecated on x86-64
+ set (CMAKE_OSX_ARCHITECTURES i386)
+endif ()
if (NOT TIFF_FOUND)
set (TIFF_INCLUDE_DIR ${CMAKE_BINARY_DIR}/tiff ${CMAKE_SOURCE_DIR}/tiff)
@@ -59,12 +62,13 @@ if (NOT TIFF_FOUND)
add_subdirectory (tiff)
endif ()
+set (GLEXT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/glext)
+
if (WIN32)
add_definitions (-D__WIN__ -D__MS__)
elseif (APPLE)
add_definitions (-D__AGL__ -D__UNIX__)
find_library (CARBON_LIBRARY Carbon)
- set (CMAKE_OSX_ARCHITECTURES i386)
else ()
add_definitions (-D__X11__ -D__UNIX__)
endif ()
diff --git a/src/tiff/CMakeLists.txt b/src/tiff/CMakeLists.txt
index d7404ee..1e736da 100644
--- a/src/tiff/CMakeLists.txt
+++ b/src/tiff/CMakeLists.txt
@@ -20,6 +20,8 @@ check_include_file (unistd.h HAVE_UNISTD_H)
check_include_file (string.h HAVE_STRING_H)
check_include_file (windows.h HAVE_WINDOWS_H)
+set (HAVE_APPLE_OPENGL_FRAMEWORK ${APPLE})
+
# Check for standard library functions
check_function_exists (floor HAVE_FLOOR)
check_function_exists (isascii HAVE_ISASCII)
|
|
From: Jose F. <jrf...@us...> - 2011-07-17 16:34:55
|
Module: glean Branch: master Commit: c06c131d79abaea87bc97548163c5fd9ac39e119 URL: no.cgit.repo/commit/?id=c06c131d79abaea87bc97548163c5fd9ac39e119 Author: José Fonseca <jfo...@vm...> Date: Fri Jul 15 16:08:28 2011 +0100 Don't depend on glut to get proc addresses on MacOSX. dlsym() is all one needs. --- src/glean/glutils.cpp | 4 ++-- src/glh/glwrap.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/glean/glutils.cpp b/src/glean/glutils.cpp index 2c8ab60..70cf0cc 100644 --- a/src/glean/glutils.cpp +++ b/src/glean/glutils.cpp @@ -37,7 +37,7 @@ #include "environ.h" #include "lex.h" #include "glutils.h" -#if defined(__X11__) +#if defined(__X11__) || defined(__AGL__) # include <dlfcn.h> #endif #if defined(__AGL__) @@ -141,7 +141,7 @@ void # error "Need GetProcAddress (or equivalent) for BeOS" return 0; #elif defined(__AGL__) - return reinterpret_cast<void (*)()>(glutGetProcAddress(name)); + return reinterpret_cast<void (*)()>(dlsym(RTLD_DEFAULT, name)); #endif } // getProcAddress diff --git a/src/glh/glwrap.h b/src/glh/glwrap.h index 8463eb3..91e5d48 100644 --- a/src/glh/glwrap.h +++ b/src/glh/glwrap.h @@ -74,7 +74,6 @@ # include <Carbon/Carbon.h> # include <OpenGL/glu.h> # include <OpenGL/glext.h> -# include <GLUT/glut.h> # include <AGL/agl.h> # include <AGL/aglRenderers.h> # if !defined(APIENTRY) |
|
From: Jose F. <jrf...@us...> - 2011-07-17 16:34:52
|
Module: glean Branch: master Commit: 81469c15be2a5abc49616fd6e51b74dba2b1fbb7 URL: no.cgit.repo/commit/?id=81469c15be2a5abc49616fd6e51b74dba2b1fbb7 Author: José Fonseca <jfo...@vm...> Date: Fri Jul 15 15:42:08 2011 +0100 Use static MSVC runtime. Avoids having to install the MSVC redistributable runtime. --- src/CMakeLists.txt | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 981179d..217b52a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -38,6 +38,17 @@ else () add_definitions (-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS) add_definitions (-D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS) + + # Use static runtime + # http://www.cmake.org/Wiki/CMake_FAQ#How_can_I_build_my_MSVC_application_with_a_static_runtime.3F + foreach (flag_var + CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO + CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO + ) + if (${flag_var} MATCHES "/MD") + string (REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") + endif (${flag_var} MATCHES "/MD") + endforeach (flag_var) endif () set (GLEXT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/glext) |
|
From: Jose F. <jrf...@us...> - 2011-07-17 16:34:48
|
Module: glean
Branch: master
Commit: bed6d2bdd630fee36e6f1320ea8d2b7f251b8e09
URL: no.cgit.repo/commit/?id=bed6d2bdd630fee36e6f1320ea8d2b7f251b8e09
Author: José Fonseca <jfo...@vm...>
Date: Fri Jul 15 14:53:06 2011 +0100
Put all executables into the bin subdirectory.
---
src/CMakeLists.txt | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5651e4f..981179d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,6 +9,17 @@ find_package(OpenGL REQUIRED)
find_package(TIFF)
find_package(GLUT)
+# Put all executables into the bin subdirectory
+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+
+# Do the same for MSVC, regardless of the build type. This only works correctly
+# for CMake 2.8.1 and above.
+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin)
+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin)
+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_BINARY_DIR}/bin)
+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR}/bin)
+
if (NOT MSVC)
check_c_compiler_flag ("-Wall" C_COMPILER_FLAG_WALL)
if (C_COMPILER_FLAG_WALL)
|
|
From: Jose F. <jrf...@us...> - 2011-07-17 16:34:45
|
Module: glean
Branch: master
Commit: 1f4dbe7e9f9f7dbcfe3b084aeeccb89365c68da7
URL: no.cgit.repo/commit/?id=1f4dbe7e9f9f7dbcfe3b084aeeccb89365c68da7
Author: José Fonseca <jfo...@vm...>
Date: Fri Jul 15 14:52:56 2011 +0100
Add the glut include path.
---
src/CMakeLists.txt | 1 +
src/tools/difftiff/CMakeLists.txt | 4 ++--
src/tools/showtiff/CMakeLists.txt | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5b807e9..5651e4f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -56,6 +56,7 @@ include_directories (
libs/timer
glh
${GLEXT_INCLUDE_DIR}
+ ${GLUT_INCLUDE_DIR}
${OPENGL_INCLUDE_DIR}
${TIFF_INCLUDE_DIR}
)
diff --git a/src/tools/difftiff/CMakeLists.txt b/src/tools/difftiff/CMakeLists.txt
index b7436af..1a2e362 100644
--- a/src/tools/difftiff/CMakeLists.txt
+++ b/src/tools/difftiff/CMakeLists.txt
@@ -9,9 +9,9 @@ target_link_libraries (difftiff
stats
timer
${TIFF_LIBRARY}
- ${OPENGL_gl_LIBRARY}
- ${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
+ ${OPENGL_glu_LIBRARY}
+ ${OPENGL_gl_LIBRARY}
)
if (WIN32)
diff --git a/src/tools/showtiff/CMakeLists.txt b/src/tools/showtiff/CMakeLists.txt
index 8b9bbf8..c219dd1 100644
--- a/src/tools/showtiff/CMakeLists.txt
+++ b/src/tools/showtiff/CMakeLists.txt
@@ -9,9 +9,9 @@ target_link_libraries (showtiff
stats
timer
${TIFF_LIBRARY}
- ${OPENGL_gl_LIBRARY}
- ${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
+ ${OPENGL_glu_LIBRARY}
+ ${OPENGL_gl_LIBRARY}
)
if (WIN32)
|
|
From: Jose F. <jrf...@us...> - 2011-07-17 16:34:41
|
Module: glean Branch: master Commit: 12e52eb5b8dcb3b866c8b6085ef021dae253663f URL: no.cgit.repo/commit/?id=12e52eb5b8dcb3b866c8b6085ef021dae253663f Author: José Fonseca <jfo...@vm...> Date: Fri Jul 15 14:30:17 2011 +0100 Drop scons build support. Broken on windows 64 bits, and obsoleted by CMake, which needs much less customization/tweaking to work as desired. --- .gitignore | 2 - doc/html/build.html | 1 - doc/html/buildscons.html | 75 ------------- scons/crossmingw.py | 185 -------------------------------- src/SConscript | 1 - src/SConstruct | 236 ----------------------------------------- src/glean/SConscript | 87 --------------- src/libs/SConscript | 1 - src/libs/dsurf/SConscript | 11 -- src/libs/image/SConscript | 16 --- src/libs/lex/SConscript | 10 -- src/libs/stats/SConscript | 10 -- src/libs/timer/SConscript | 10 -- src/tiff/SConscript | 166 ----------------------------- src/tools/SConscript | 1 - src/tools/difftiff/SConscript | 16 --- src/tools/showtiff/SConscript | 16 --- src/tools/showvis/SConscript | 15 --- 18 files changed, 0 insertions(+), 859 deletions(-) diff --git a/.gitignore b/.gitignore index bbbbc02..0b143a4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ .*.sw? -.scon* *.a *.dep *.exe @@ -13,4 +12,3 @@ *.so *.zip build -config.log diff --git a/doc/html/build.html b/doc/html/build.html index 28b3a81..b23fb5b 100644 --- a/doc/html/build.html +++ b/doc/html/build.html @@ -59,7 +59,6 @@ Once you've completed those tasks, choose one of the following: <LI><A HREF="buildgnu.html">Building <I>glean</I> for GNU/Linux</A></LI> <LI><A HREF="buildwin.html">Building <I>glean</I> for Windows</A></LI> <LI><A HREF="buildcmake.html">Building <I>glean</I> for GNU/Linux or Windows using cmake</A></LI> - <LI><A HREF="buildscons.html">Building <I>glean</I> for GNU/Linux or Windows using scons</A></LI> </UL> diff --git a/doc/html/buildscons.html b/doc/html/buildscons.html deleted file mode 100644 index 5be8d05..0000000 --- a/doc/html/buildscons.html +++ /dev/null @@ -1,75 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> -<HTML> - -<HEAD> - <TITLE>Building glean using scons</TITLE> - <META NAME="description" CONTENT="building glean using scons"> - <META NAME="author" CONTENT="Jose Fonseca"> - <LINK REV="made" HREF="mailto:jfo...@vm..."> -</HEAD> - -<BODY bgcolor=#FFFFFF topmargin="10" bottommargin="10" leftmargin="10" - rightmargin="10" marginheight="0" marginwidth="0"> - -<H1>Building <I>glean</I> with scons</H1> - -<P> -Now you can build glean on GNU/Linux or Windows using -<A HREF="http://www.scons.org/">scons</A>. The advantages over GNU make are: -<UL TYPE=DISC> - <LI> no need to set build options — everything is autodetected; - <LI> automatically uses an included tiff library if none can be found; - <LI> support to cross build from GNU/Linux to Windows using MinGW cross - compilers. -</UL> - -<H2>Build <I>glean</I> on GNU/Linux or Windows</H2> - -<P> -Simply type -<PRE> - scons -C src -</PRE> - -<P> -Everything should be autodetected for you. - -<P> -You can change aspects of the build by passing options in the name=value. To -list these options and see their default value do -<PRE> - scons -C src -h -</PRE> - - -<H2>Build <I>glean</I> for Windows on GNU/Linux</H2> - -<P> -Type -<PRE> - scons -C src platform=windows machine=x86 toolchain=crossmingw -</PRE> - - -<HR> -<SMALL> - <UL TYPE=DISC> - <LI> <A HREF="index.html"><I>glean</I> home</A> - <LI> <A HREF="whatis.html">What is <I>glean</I>?</A> - <LI> <A HREF="build.html">How do I build <I>glean</I>?</A> - <LI> <A HREF="run.html">How do I run <I>glean</I>?</A> - <LI> <A HREF="next.html">Where do we go from here?</A> - <UL TYPE=CIRCLE> - <LI> <A HREF="newtest.html">Adding new tests</A> - <LI> <A HREF="newfeat.html">Adding new infrastructure features</A> - <LI> <A HREF="overview.html">Overview of <I>glean</I> internals</A> - <LI> <A HREF="repo.html">Creating a repository of results</A> - <LI> <A HREF="port.html">Porting <I>glean</I></A> - <LI> <A HREF="cleanup.html">Cleaning up loose ends</A> - </UL> - <LI> <A HREF="changes.html">What has changed recently?</A> - </UL> -</SMALL> - -</BODY> -</HTML> diff --git a/scons/crossmingw.py b/scons/crossmingw.py deleted file mode 100644 index bf81f16..0000000 --- a/scons/crossmingw.py +++ /dev/null @@ -1,185 +0,0 @@ -"""SCons.Tool.gcc - -Tool-specific initialization for MinGW (http://www.mingw.org/) - -There normally shouldn't be any need to import this module directly. -It will usually be imported through the generic SCons.Tool.Tool() -selection method. - -See also http://www.scons.org/wiki/CrossCompilingMingw -""" - -# -# Copyright (c) 2001, 2002, 2003, 2004 The SCons Foundation -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# - -import os -import os.path -import string - -import SCons.Action -import SCons.Builder -import SCons.Tool -import SCons.Util - -# This is what we search for to find mingw: -prefixes = SCons.Util.Split(""" - mingw32- - mingw32msvc- - i386-mingw32- - i486-mingw32- - i586-mingw32- - i686-mingw32- - i386-mingw32msvc- - i486-mingw32msvc- - i586-mingw32msvc- - i686-mingw32msvc- -""") - -def find(env): - for prefix in prefixes: - # First search in the SCons path and then the OS path: - if env.WhereIs(prefix + 'gcc') or SCons.Util.WhereIs(prefix + 'gcc'): - return prefix - - return '' - -def shlib_generator(target, source, env, for_signature): - cmd = SCons.Util.CLVar(['$SHLINK', '$SHLINKFLAGS']) - - dll = env.FindIxes(target, 'SHLIBPREFIX', 'SHLIBSUFFIX') - if dll: cmd.extend(['-o', dll]) - - cmd.extend(['$SOURCES', '$_LIBDIRFLAGS', '$_LIBFLAGS']) - - implib = env.FindIxes(target, 'LIBPREFIX', 'LIBSUFFIX') - if implib: cmd.append('-Wl,--out-implib,'+implib.get_string(for_signature)) - - def_target = env.FindIxes(target, 'WIN32DEFPREFIX', 'WIN32DEFSUFFIX') - if def_target: cmd.append('-Wl,--output-def,'+def_target.get_string(for_signature)) - - return [cmd] - -def shlib_emitter(target, source, env): - dll = env.FindIxes(target, 'SHLIBPREFIX', 'SHLIBSUFFIX') - no_import_lib = env.get('no_import_lib', 0) - - if not dll: - raise SCons.Errors.UserError, "A shared library should have exactly one target with the suffix: %s" % env.subst("$SHLIBSUFFIX") - - if not no_import_lib and \ - not env.FindIxes(target, 'LIBPREFIX', 'LIBSUFFIX'): - - # Append an import library to the list of targets. - target.append(env.ReplaceIxes(dll, - 'SHLIBPREFIX', 'SHLIBSUFFIX', - 'LIBPREFIX', 'LIBSUFFIX')) - - # Append a def file target if there isn't already a def file target - # or a def file source. There is no option to disable def file - # target emitting, because I can't figure out why someone would ever - # want to turn it off. - def_source = env.FindIxes(source, 'WIN32DEFPREFIX', 'WIN32DEFSUFFIX') - def_target = env.FindIxes(target, 'WIN32DEFPREFIX', 'WIN32DEFSUFFIX') - if not def_source and not def_target: - target.append(env.ReplaceIxes(dll, - 'SHLIBPREFIX', 'SHLIBSUFFIX', - 'WIN32DEFPREFIX', 'WIN32DEFSUFFIX')) - - return (target, source) - - -shlib_action = SCons.Action.Action(shlib_generator, generator=1) - -res_action = SCons.Action.Action('$RCCOM', '$RCCOMSTR') - -res_builder = SCons.Builder.Builder(action=res_action, suffix='.o', - source_scanner=SCons.Tool.SourceFileScanner) -SCons.Tool.SourceFileScanner.add_scanner('.rc', SCons.Defaults.CScan) - -def generate(env): - mingw_prefix = find(env) - - if mingw_prefix: - dir = os.path.dirname(env.WhereIs(mingw_prefix + 'gcc') or SCons.Util.WhereIs(mingw_prefix + 'gcc')) - - # The mingw bin directory must be added to the path: - path = env['ENV'].get('PATH', []) - if not path: - path = [] - if SCons.Util.is_String(path): - path = string.split(path, os.pathsep) - - env['ENV']['PATH'] = string.join([dir] + path, os.pathsep) - - # Most of mingw is the same as gcc and friends... - gnu_tools = ['gcc', 'g++', 'gnulink', 'ar', 'gas'] - for tool in gnu_tools: - SCons.Tool.Tool(tool)(env) - - #... but a few things differ: - env['CC'] = mingw_prefix + 'gcc' - env['SHCCFLAGS'] = SCons.Util.CLVar('$CCFLAGS') - env['CXX'] = mingw_prefix + 'g++' - env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS') - env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS -shared') - env['SHLINKCOM'] = shlib_action - env.Append(SHLIBEMITTER = [shlib_emitter]) - env['LINK'] = mingw_prefix + 'g++' - env['AR'] = mingw_prefix + 'ar' - env['RANLIB'] = mingw_prefix + 'ranlib' - env['LINK'] = mingw_prefix + 'g++' - env['AS'] = mingw_prefix + 'as' - env['WIN32DEFPREFIX'] = '' - env['WIN32DEFSUFFIX'] = '.def' - env['SHOBJSUFFIX'] = '.o' - env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1 - - env['RC'] = mingw_prefix + 'windres' - env['RCFLAGS'] = SCons.Util.CLVar('') - env['RCCOM'] = '$RC $_CPPDEFFLAGS $_CPPINCFLAGS ${INCPREFIX}${SOURCE.dir} $RCFLAGS -i $SOURCE -o $TARGET' - env['BUILDERS']['RES'] = res_builder - - # Some setting from the platform also have to be overridden: - env['OBJPREFIX'] = '' - env['OBJSUFFIX'] = '.o' - env['SHOBJPREFIX'] = '$OBJPREFIX' - env['SHOBJSUFFIX'] = '$OBJSUFFIX' - env['PROGPREFIX'] = '' - env['PROGSUFFIX'] = '.exe' - env['LIBPREFIX'] = 'lib' - env['LIBSUFFIX'] = '.a' - env['SHLIBPREFIX'] = '' - env['SHLIBSUFFIX'] = '.dll' - env['LIBPREFIXES'] = [ 'lib', '' ] - env['LIBSUFFIXES'] = [ '.a', '.lib' ] - - # MinGW port of gdb does not handle well dwarf debug info which is the - # default in recent gcc versions - env.AppendUnique(CFLAGS = ['-gstabs']) - - env.AppendUnique(LIBS = ['iberty']) - env.AppendUnique(SHLINKFLAGS = ['-Wl,--enable-stdcall-fixup']) - #env.AppendUnique(SHLINKFLAGS = ['-Wl,--kill-at']) - -def exists(env): - return find(env) diff --git a/src/SConscript b/src/SConscript deleted file mode 100644 index f2b3d26..0000000 --- a/src/SConscript +++ /dev/null @@ -1 +0,0 @@ -SConscript(dirs = ['libs', 'glean', 'tools']) diff --git a/src/SConstruct b/src/SConstruct deleted file mode 100644 index 37be39a..0000000 --- a/src/SConstruct +++ /dev/null @@ -1,236 +0,0 @@ -import os -import platform -import sys - -_platform_map = { - 'darwin': 'darwin', - 'freebsd': 'freebsd', - 'linux2': 'linux', - 'win32': 'windows', -} - -default_platform = _platform_map.get(sys.platform, 'unix') - -_machine_map = { - 'x86': 'x86', - 'i386': 'x86', - 'i486': 'x86', - 'i586': 'x86', - 'i686': 'x86', - 'ppc' : 'ppc', - 'x86_64': 'x86_64', -} -if 'PROCESSOR_ARCHITECTURE' in os.environ: - default_machine = os.environ['PROCESSOR_ARCHITECTURE'] -else: - default_machine = platform.machine() -default_machine = _machine_map.get(default_machine, 'generic') - -if default_platform == 'windows': - default_prefix = os.path.join(os.environ.get('ProgramFiles', 'C:\\Program Files'), 'glean') -else: - default_prefix = '/usr/local' - -vars = Variables() -vars.Add(BoolVariable('debug', 'debug build', 'yes')) -vars.Add(EnumVariable('platform', 'target platform', default_platform, - allowed_values=('linux', 'freebsd', 'unix', 'other', 'windows', 'darwin'))) -vars.Add(EnumVariable('machine', 'use machine-specific assembly code', default_machine, - allowed_values=('generic', 'ppc', 'x86', 'x86_64'))) -vars.Add(EnumVariable('toolchain', 'compiler toolchain', 'default', - allowed_values=('default', 'crossmingw'))) -vars.Add(PathVariable('prefix', 'installation prefix', default_prefix, PathVariable.PathIsDirCreate)) -if platform.machine() == 'win32': - vars.Add(EnumVariable('MSVS_VERSION', 'Microsoft Visual Studio version', None, - allowed_values=('7.1', '8.0', '9.0'))) - -env = Environment(variables=vars) -Help(vars.GenerateHelpText(env)) - -Export(['env']) - -env.Tool(env['toolchain'], ['../scons']) - -env['gcc'] = 'gcc' in os.path.basename(env['CC']).split('-') -env['msvc'] = env['CC'] == 'cl' - -# C preprocessor options -cppdefines = [] -if not env['debug']: - cppdefines += ['NDEBUG'] -if env['platform'] == 'windows': - cppdefines += [ - 'WIN32', - '_CONSOLE', - '_MBCS', - ] - if env['debug']: - cppdefines += ['_DEBUG'] -env.Append(CPPDEFINES = cppdefines) - -# C compiler options -cflags = [] # C -cxxflags = [] # C++ -ccflags = [] # C & C++ -if env['gcc']: - if env['debug']: - ccflags += ['-O0', '-g3'] - else: - ccflags += ['-O3', '-g0'] - if env['machine'] == 'x86': - ccflags += ['-m32'] - if env['machine'] == 'x86_64': - ccflags += ['-m64'] - # See also: - # - http://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html - ccflags += [ - '-Wall', - '-Wmissing-field-initializers', - '-Wpointer-arith', - '-fmessage-length=0', # be nice to Eclipse - ] - cflags += [ - '-Wdeclaration-after-statement', - '-Wmissing-prototypes', - ] -if env['msvc']: - if env['debug']: - ccflags += [ - '/Od', # disable optimizations - '/Oi', # enable intrinsic functions - '/Oy-', # disable frame pointer omission - '/GL-', # disable whole program optimization - ] - else: - ccflags += [ - '/O2', # optimize for speed - ] - ccflags += [ - '/EHsc', # set exception handling model - #'/W3', # warning level - #'/Wp64', # enable 64 bit porting warnings - ] - # Automatic pdb generation - # See http://scons.tigris.org/issues/show_bug.cgi?id=1656 - env.EnsureSConsVersion(0, 98, 0) - env['PDB'] = '${TARGET.base}.pdb' -env.Append(CCFLAGS = ccflags) -env.Append(CFLAGS = cflags) -env.Append(CXXFLAGS = cxxflags) - -if env['platform'] == 'windows' and env['msvc']: - # Choose the appropriate MSVC CRT - # http://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx - if env['debug']: - env.Append(CCFLAGS = ['/MTd']) - env.Append(SHCCFLAGS = ['/LDd']) - else: - env.Append(CCFLAGS = ['/MT']) - env.Append(SHCCFLAGS = ['/LD']) - -# Assembler options -if env['gcc']: - if env['machine'] == 'x86': - env.Append(ASFLAGS = ['-m32']) - if env['machine'] == 'x86_64': - env.Append(ASFLAGS = ['-m64']) - -# Linker options -linkflags = [] -if env['gcc']: - if env['machine'] == 'x86': - linkflags += ['-m32'] - if env['machine'] == 'x86_64': - linkflags += ['-m64'] -if env['platform'] == 'windows' and env['msvc']: - # See also: - # - http://msdn2.microsoft.com/en-us/library/y0zzbyt4.aspx - linkflags += [ - '/fixed:no', - '/incremental:no', - ] -env.Append(LINKFLAGS = linkflags) - -if env['platform'] in ('freebsd', 'linux', 'unix'): - env.Append(CPPDEFINES = [ - '__UNIX__', - '__X11__', - ]) - env.Prepend(LIBS = [ - 'GLU', - 'GL', - ]) - -if env['platform'] == 'windows': - env.Append(CPPDEFINES = [ - '__WIN__', - '__MS__', - ]) - env.Prepend(LIBS = [ - 'glu32', - 'opengl32', - 'gdi32', - 'user32', - 'kernel32', - ]) - -if env['platform'] == 'darwin': - env.Append(CPPDEFINES = [ - '__UNIX__', - '__AGL__', - ]) - env.Prepend(FRAMEWORKS = [ - 'AGL', - 'Carbon', - 'GLUT', - 'OpenGL', - ]) - -variant = env['platform'] -if env['machine'] != 'generic': - variant += '-' + env['machine'] -if env['debug']: - variant += '-debug' -env['variant'] = variant - -# Put all SCons' persistent data in the build dir -build_dir = os.path.join('..', 'build', variant) -env.SConsignFile(os.path.join(build_dir, 'sign')) -env['CONFIGUREDIR'] = os.path.join(build_dir, 'conf') -env['CONFIGURELOG'] = os.path.join(build_dir, 'config.log') - -conf = Configure(env) -if not conf.CheckCHeader('GL/glext.h'): - conf.env.Prepend(CPPPATH = ['#glext']) -if conf.CheckCHeader('GL/glut.h'): - if env['platform'] == 'windows': - conf.env.Prepend(LIBS = ['glut32']) - else: - conf.env.Prepend(LIBS = ['glut']) - conf.env['glut'] = True -else: - conf.env['glut'] = False -has_tiff = conf.CheckCHeader('tiff.h') -env = conf.Finish() - -if has_tiff: - conf.env.Prepend(LIBS = ['tiff']) -else: - SConscript(['tiff/SConscript']) - Import(['tiff']) - conf.env.Prepend(CPPPATH = ['#tiff']) - conf.env.Prepend(LIBS = [tiff]) - -env.Prepend(CPPPATH = [ - '#glh', - '#libs/dsurf', - '#libs/image', - '#libs/lex', - '#libs/rand', - '#libs/stats', - '#libs/timer', -]) - -env.VariantDir(build_dir, '.', duplicate=0) - -SConscript('SConscript', variant_dir=build_dir, duplicate=0) diff --git a/src/glean/SConscript b/src/glean/SConscript deleted file mode 100644 index 3a39966..0000000 --- a/src/glean/SConscript +++ /dev/null @@ -1,87 +0,0 @@ -import os.path - -Import(['*']) - -env = env.Clone() - -env.Prepend(LIBS = [ - dsurf, - lex, - image, - stats, - timer, -]) - -main = [ - 'codedid.cpp', - 'dsurf.cpp', - 'environ.cpp', - 'geomrend.cpp', - 'geomutil.cpp', - 'glutils.cpp', - 'main.cpp', - 'misc.cpp', - 'options.cpp', - 'rc.cpp', - 'test.cpp', - 'winsys.cpp', -] - -tests = [ - 'tapi2.cpp', - 'tbasic.cpp', - 'tbasicperf.cpp', - 'tbinding.cpp', - 'tblend.cpp', - 'tbufferobject.cpp', - 'tchgperf.cpp', - 'tclipflat.cpp', - 'tdepthstencil.cpp', - 'tfbo.cpp', - 'tfpexceptions.cpp', - 'tfragprog1.cpp', - 'tgetstr.cpp', - 'tglsl1.cpp', - 'tlogicop.cpp', - 'tmaskedclear.cpp', - 'tmultitest.cpp', - 'toccluqry.cpp', - 'torthpos.cpp', - 'tpaths.cpp', - 'tpbo.cpp', - 'tpgos.cpp', - 'tpixelformats.cpp', - 'tpointatten.cpp', - 'tpointsprite.cpp', - 'treadpix.cpp', - 'treadpixperf.cpp', - 'trgbtris.cpp', - 'tscissor.cpp', - 'tshaderapi.cpp', - 'tstencil2.cpp', - 'tteapot.cpp', - 'ttexcombine4.cpp', - 'ttexcombine.cpp', - 'ttexcube.cpp', - 'ttexenv.cpp', - 'ttexgen.cpp', - 'ttexrect.cpp', - 'ttexswizzle.cpp', - 'ttexture_srgb.cpp', - 'ttexunits.cpp', - 'tvertattrib.cpp', - 'tvertarraybgra.cpp', - 'tvertprog1.cpp', - 'tvtxperf.cpp', -] - -glean = env.Program( - target = 'glean', - source = main + tests, -) - -env.Default(glean) - -bin_dir = os.path.join(env['prefix'], 'bin') -env.Install(bin_dir, glean) -env.Alias('install', bin_dir) diff --git a/src/libs/SConscript b/src/libs/SConscript deleted file mode 100644 index 2b3fdc0..0000000 --- a/src/libs/SConscript +++ /dev/null @@ -1 +0,0 @@ -SConscript(dirs = ['rand', 'timer', 'stats', 'image', 'lex', 'dsurf']) diff --git a/src/libs/dsurf/SConscript b/src/libs/dsurf/SConscript deleted file mode 100644 index f34aace..0000000 --- a/src/libs/dsurf/SConscript +++ /dev/null @@ -1,11 +0,0 @@ -Import(['env']) - -dsurf = env.StaticLibrary( - target = 'dsurf', - source = [ - 'dsconfig.cpp', - 'dsfilt.cpp', - ], -) - -Export(['dsurf']) diff --git a/src/libs/image/SConscript b/src/libs/image/SConscript deleted file mode 100644 index f3e1344..0000000 --- a/src/libs/image/SConscript +++ /dev/null @@ -1,16 +0,0 @@ -Import(['env']) - -image = env.StaticLibrary( - target = 'image', - source = [ - 'gl.cpp', - 'misc.cpp', - 'pack.cpp', - 'rdtiff.cpp', - 'reg.cpp', - 'unpack.cpp', - 'wrtiff.cpp', - ], -) - -Export(['image']) diff --git a/src/libs/lex/SConscript b/src/libs/lex/SConscript deleted file mode 100644 index ba4d967..0000000 --- a/src/libs/lex/SConscript +++ /dev/null @@ -1,10 +0,0 @@ -Import(['env']) - -lex = env.StaticLibrary( - target = 'lex', - source = [ - 'lex.cpp', - ], -) - -Export(['lex']) diff --git a/src/libs/rand/SConscript b/src/libs/rand/SConscript deleted file mode 100644 index e69de29..0000000 diff --git a/src/libs/stats/SConscript b/src/libs/stats/SConscript deleted file mode 100644 index 694f56f..0000000 --- a/src/libs/stats/SConscript +++ /dev/null @@ -1,10 +0,0 @@ -Import(['env']) - -stats = env.StaticLibrary( - target = 'stats', - source = [ - 'basic.cpp', - ], -) - -Export(['stats']) diff --git a/src/libs/timer/SConscript b/src/libs/timer/SConscript deleted file mode 100644 index ab3bd5a..0000000 --- a/src/libs/timer/SConscript +++ /dev/null @@ -1,10 +0,0 @@ -Import(['env']) - -timer = env.StaticLibrary( - target = 'timer', - source = [ - 'timer.cpp', - ], -) - -Export(['timer']) diff --git a/src/tiff/SConscript b/src/tiff/SConscript deleted file mode 100644 index 276dbab..0000000 --- a/src/tiff/SConscript +++ /dev/null @@ -1,166 +0,0 @@ -# $Id: SConstruct,v 1.2 2006/03/23 14:54:00 dron Exp $ - -# Tag Image File Format (TIFF) Software -# -# Copyright (C) 2005, Andrey Kiselev <dr...@ak...> -# -# Permission to use, copy, modify, distribute, and sell this software and -# its documentation for any purpose is hereby granted without fee, provided -# that (i) the above copyright notices and this permission notice appear in -# all copies of the software and related documentation, and (ii) the names of -# Sam Leffler and Silicon Graphics may not be used in any advertising or -# publicity relating to the software without the specific, prior written -# permission of Sam Leffler and Silicon Graphics. -# -# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, -# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY -# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. -# -# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR -# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, -# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF -# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE -# OF THIS SOFTWARE. - -Import(['env']) - -env = env.Clone() - -sources = [ - 'tif_aux.c', - 'tif_close.c', - 'tif_codec.c', - 'tif_color.c', - 'tif_compress.c', - 'tif_dir.c', - 'tif_dirinfo.c', - 'tif_dirread.c', - 'tif_dirwrite.c', - 'tif_dumpmode.c', - 'tif_error.c', - 'tif_extension.c', - 'tif_fax3.c', - 'tif_fax3sm.c', - 'tif_flush.c', - 'tif_getimage.c', - 'tif_jpeg.c', - 'tif_luv.c', - 'tif_lzw.c', - 'tif_next.c', - 'tif_ojpeg.c', - 'tif_open.c', - 'tif_packbits.c', - 'tif_pixarlog.c', - 'tif_predict.c', - 'tif_print.c', - 'tif_read.c', - 'tif_strip.c', - 'tif_swab.c', - 'tif_thunder.c', - 'tif_tile.c', - 'tif_version.c', - 'tif_warning.c', - 'tif_write.c', - 'tif_zip.c', -] - -if env['platform'] == 'windows': - sources += ['tif_win32.c'] - - env.Append(CPPDEFINES = [ - ('inline', '__inline'), - ]) -elif env['platform'] == 'darwin': - sources += ['tif_apple.c'] - env.Prepend(CPPPATH = ['/Developer/Headers/FlatCarbon']) -else: - sources += ['tif_unix.c'] - -def Define(context, key, have): - import SCons.Conftest - SCons.Conftest._Have(context, key, have) - -def CheckCustomOption(context, name): - context.Message('Checking is the ' + name + ' option set... ') - ret = True - Define(context, name + '_SUPPORT', ret) - context.Result(ret) - return ret - -def CheckFillorderOption(context): - context.Message('Checking for the native cpu bit order... ') - if True: # FIXME - Define(context, 'HOST_FILLORDER', 'FILLORDER_LSB2MSB') - context.Result('lsb2msb') - else: - Define(context, 'HOST_FILLORDER', 'FILLORDER_MSB2LSB') - context.Result('msb2lsb') - return 1 - -def CheckIEEEFPOption(context): - context.Message('Checking for the IEEE floating point format... ') - Define(context, 'HAVE_IEEEFP', 1) - context.Result(1) - return 1 - -def CheckOtherOption(context, name): - context.Message('Checking is the ' + name + ' option set... ') - ret = True - Define(context, 'HAVE_' + name, ret) - context.Result(ret) - return ret - -custom_tests = { - 'CheckCustomOption' : CheckCustomOption, - 'CheckFillorderOption' : CheckFillorderOption, - 'CheckIEEEFPOption' : CheckIEEEFPOption, - 'CheckOtherOption' : CheckOtherOption - } -conf = Configure(env, custom_tests = custom_tests, config_h = 'tif_config.h') - -# Check for standard library -conf.CheckLib('c') -if False: # FIXME - conf.CheckLib('m') - -# Check for system headers -conf.CheckCHeader('assert.h') -conf.CheckCHeader('fcntl.h') -conf.CheckCHeader('limits.h') -conf.CheckCHeader('malloc.h') -conf.CheckCHeader('search.h') -conf.CheckCHeader('sys/time.h') -conf.CheckCHeader('unistd.h') -conf.CheckCHeader('string.h') - -# Check for standard library functions -conf.CheckFunc('floor') -conf.CheckFunc('isascii') -conf.CheckFunc('memmove') -conf.CheckFunc('memset') -conf.CheckFunc('mmap') -conf.CheckFunc('pow') -conf.CheckFunc('sqrt') -conf.CheckFunc('strchr') -conf.CheckFunc('strrchr') -conf.CheckFunc('strstr') -conf.CheckFunc('strtol') - -conf.CheckFillorderOption() -conf.CheckIEEEFPOption() -conf.CheckCustomOption('ccitt') -conf.CheckCustomOption('packbits') -conf.CheckCustomOption('lzw') -conf.CheckCustomOption('thunder') -conf.CheckCustomOption('next') -conf.CheckCustomOption('logluv') -conf.CheckOtherOption('strip_chopping') -conf.CheckOtherOption('extrasample_as_alpha') -conf.CheckOtherOption('check_ycbcr_subsampling') - -env = conf.Finish() - -tiff = env.StaticLibrary('tiff', sources) - -Export('tiff') diff --git a/src/tools/SConscript b/src/tools/SConscript deleted file mode 100644 index 4d5260c..0000000 --- a/src/tools/SConscript +++ /dev/null @@ -1 +0,0 @@ -SConscript(dirs = ['showtiff', 'difftiff', 'showvis']) diff --git a/src/tools/difftiff/SConscript b/src/tools/difftiff/SConscript deleted file mode 100644 index 56ca5a1..0000000 --- a/src/tools/difftiff/SConscript +++ /dev/null @@ -1,16 +0,0 @@ -import os.path - -Import(['*']) - -if env['glut']: - env = env.Clone() - - env.Prepend(LIBS = [image]) - - difftiff = env.Program('difftiff', ['main.cpp']) - - env.Default(difftiff) - - bin_dir = os.path.join(env['prefix'], 'bin') - env.Install(bin_dir, difftiff) - env.Alias('install', bin_dir) diff --git a/src/tools/showtiff/SConscript b/src/tools/showtiff/SConscript deleted file mode 100644 index 52a1a72..0000000 --- a/src/tools/showtiff/SConscript +++ /dev/null @@ -1,16 +0,0 @@ -import os.path - -Import(['*']) - -if env['glut']: - env = env.Clone() - - env.Prepend(LIBS = [image]) - - showtiff = env.Program('showtiff', ['main.cpp']) - - env.Default(showtiff) - - bin_dir = os.path.join(env['prefix'], 'bin') - env.Install(bin_dir, showtiff) - env.Alias('install', bin_dir) diff --git a/src/tools/showvis/SConscript b/src/tools/showvis/SConscript deleted file mode 100644 index 42f09d4..0000000 --- a/src/tools/showvis/SConscript +++ /dev/null @@ -1,15 +0,0 @@ -import os.path - -Import(['*']) - -env = env.Clone() - -env.Prepend(LIBS = [dsurf, lex]) - -showvis = env.Program('showvis', ['main.cpp']) - -env.Default(showvis) - -bin_dir = os.path.join(env['prefix'], 'bin') -env.Install(bin_dir, showvis) -env.Alias('install', bin_dir) |
|
From: Jose F. <jrf...@us...> - 2011-07-17 16:34:37
|
Module: glean
Branch: master
Commit: d4263e22f1a405652b80c7bd6ebf0be380b30c4d
URL: no.cgit.repo/commit/?id=d4263e22f1a405652b80c7bd6ebf0be380b30c4d
Author: José Fonseca <jfo...@vm...>
Date: Fri Jul 15 14:27:49 2011 +0100
Support building with CMake.
Tested with Linux GCC, MSVC, and MinGW crosscompilers.
---
doc/html/build.html | 1 +
doc/html/buildcmake.html | 116 ++++++++++++++
src/CMakeLists.txt | 65 ++++++++
src/glean/CMakeLists.txt | 30 ++++
src/libs/CMakeLists.txt | 5 +
src/libs/dsurf/CMakeLists.txt | 3 +
src/libs/image/CMakeLists.txt | 3 +
src/libs/lex/CMakeLists.txt | 3 +
src/libs/stats/CMakeLists.txt | 3 +
src/libs/timer/CMakeLists.txt | 3 +
src/tiff/CMakeLists.txt | 113 ++++++++++++++
src/tiff/tif_config.h.in | 260 ++++++++++++++++++++++++++++++++
src/tiff/{tiffconf.h => tiffconf.h.in} | 47 +++---
src/tools/CMakeLists.txt | 7 +
src/tools/difftiff/CMakeLists.txt | 31 ++++
src/tools/showtiff/CMakeLists.txt | 31 ++++
src/tools/showvis/CMakeLists.txt | 30 ++++
17 files changed, 729 insertions(+), 22 deletions(-)
diff --git a/doc/html/build.html b/doc/html/build.html
index 369df4c..28b3a81 100644
--- a/doc/html/build.html
+++ b/doc/html/build.html
@@ -58,6 +58,7 @@ Once you've completed those tasks, choose one of the following:
<UL>
<LI><A HREF="buildgnu.html">Building <I>glean</I> for GNU/Linux</A></LI>
<LI><A HREF="buildwin.html">Building <I>glean</I> for Windows</A></LI>
+ <LI><A HREF="buildcmake.html">Building <I>glean</I> for GNU/Linux or Windows using cmake</A></LI>
<LI><A HREF="buildscons.html">Building <I>glean</I> for GNU/Linux or Windows using scons</A></LI>
</UL>
diff --git a/doc/html/buildcmake.html b/doc/html/buildcmake.html
new file mode 100644
index 0000000..d315a86
--- /dev/null
+++ b/doc/html/buildcmake.html
@@ -0,0 +1,116 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+
+<HEAD>
+ <TITLE>Building glean using cmake</TITLE>
+ <META NAME="description" CONTENT="building glean using cmake">
+ <META NAME="author" CONTENT="Jose Fonseca">
+ <LINK REV="made" HREF="mailto:jfo...@vm...">
+</HEAD>
+
+<BODY bgcolor=#FFFFFF topmargin="10" bottommargin="10" leftmargin="10"
+ rightmargin="10" marginheight="0" marginwidth="0">
+
+<H1>Building <I>glean</I> with cmake</H1>
+
+<P>
+Now you can build glean on GNU/Linux or Windows using
+<A HREF="http://www.cmake.org/">cmake</A>. The advantages over GNU make are:
+<UL TYPE=DISC>
+ <LI> no need to set build options — everything is autodetected;
+ <LI> automatically uses an included tiff library if none can be found;
+ <LI> support to cross build from GNU/Linux to Windows using MinGW cross
+ compilers.
+</UL>
+
+<H2>Build <I>glean</I> on GNU/Linux</H2>
+
+<P>
+Simply type
+<PRE>
+ cmake -Hsrc -Bbuild
+ make -C build
+</PRE>
+
+<P>
+Everything should be autodetected for you.
+
+<H2>Build <I>glean</I> on Windows</H2>
+
+<P>
+Simply type
+<PRE>
+ cmake -G "Visual Studio 9 2008" -Hsrc -Bbuild
+ cmake --build build --config Debug %*
+</PRE>
+
+<P>
+Everything should be autodetected for you.
+
+<H2>Build <I>glean</I> for Windows on GNU/Linux</H2>
+
+<p>
+Create a <b>Toolchain.cmake</b> file containing:
+</p>
+<pre>
+# the name of the target operating system
+SET(CMAKE_SYSTEM_NAME Windows)
+
+# which compilers to use for C and C++
+SET(CMAKE_C_COMPILER i586-mingw32msvc-gcc)
+SET(CMAKE_CXX_COMPILER i586-mingw32msvc-g++)
+
+# here is the target environment located
+SET(CMAKE_FIND_ROOT_PATH /usr/i586-mingw32msvc)
+
+# adjust the default behaviour of the FIND_XXX() commands:
+# search headers and libraries in the target environment, search
+# programs in the host environment
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+</pre>
+
+<p>
+Create a <b>Cache.cmake</b> file containing:
+</p>
+<pre>
+set(GLUT_INCLUDE_DIR "/path/to/glut/include" CACHE PATH "" FORCE)
+set(GLUT_glut_LIBRARY "/path/to/glut/lib/libglut32.a" CACHE FILEPATH "" FORCE)
+</pre>
+
+<p>
+Then do:
+</p>
+<pre>
+cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/path/to/install -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=/path/to/Toolchain.cmake -C /path/to/Cache.cmake -Hsrc -Bbuild
+make -C build
+</pre>
+
+<p>
+Read <a href="http://www.vtk.org/Wiki/CmakeMingw">this</a> for more information about CMake and MinGW cross compilation.
+</p>
+
+
+<HR>
+<SMALL>
+ <UL TYPE=DISC>
+ <LI> <A HREF="index.html"><I>glean</I> home</A>
+ <LI> <A HREF="whatis.html">What is <I>glean</I>?</A>
+ <LI> <A HREF="build.html">How do I build <I>glean</I>?</A>
+ <LI> <A HREF="run.html">How do I run <I>glean</I>?</A>
+ <LI> <A HREF="next.html">Where do we go from here?</A>
+ <UL TYPE=CIRCLE>
+ <LI> <A HREF="newtest.html">Adding new tests</A>
+ <LI> <A HREF="newfeat.html">Adding new infrastructure features</A>
+ <LI> <A HREF="overview.html">Overview of <I>glean</I> internals</A>
+ <LI> <A HREF="repo.html">Creating a repository of results</A>
+ <LI> <A HREF="port.html">Porting <I>glean</I></A>
+ <LI> <A HREF="cleanup.html">Cleaning up loose ends</A>
+ </UL>
+ <LI> <A HREF="changes.html">What has changed recently?</A>
+ </UL>
+</SMALL>
+
+</BODY>
+</HTML>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..5b807e9
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,65 @@
+cmake_minimum_required(VERSION 2.8)
+
+include (CheckCCompilerFlag)
+include (CheckCXXCompilerFlag)
+
+project (glean)
+
+find_package(OpenGL REQUIRED)
+find_package(TIFF)
+find_package(GLUT)
+
+if (NOT MSVC)
+ check_c_compiler_flag ("-Wall" C_COMPILER_FLAG_WALL)
+ if (C_COMPILER_FLAG_WALL)
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+ endif (C_COMPILER_FLAG_WALL)
+ check_cxx_compiler_flag("-Wall" CXX_COMPILER_FLAG_WALL)
+ if (CXX_COMPILER_FLAG_WALL)
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+ endif (CXX_COMPILER_FLAG_WALL)
+else ()
+ # -Wall or (/Wall) is actually supported by MSVC and would be detected
+ # by CHECK_C_COMPILER_FLAG above, but is very pedantic, causing
+ # thousand of warnings when including windows.h.
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -W4")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W4")
+
+ add_definitions (-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS)
+ add_definitions (-D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS)
+endif ()
+
+set (GLEXT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/glext)
+
+if (NOT TIFF_FOUND)
+ set (TIFF_INCLUDE_DIR ${CMAKE_BINARY_DIR}/tiff ${CMAKE_SOURCE_DIR}/tiff)
+ set (TIFF_LIBRARY bundled_tiff)
+ add_subdirectory (tiff)
+endif ()
+
+if (WIN32)
+ add_definitions (-D__WIN__ -D__MS__)
+elseif (APPLE)
+ add_definitions (-D__AGL__ -D__UNIX__)
+ find_library (CARBON_LIBRARY Carbon)
+ set (CMAKE_OSX_ARCHITECTURES i386)
+else ()
+ add_definitions (-D__X11__ -D__UNIX__)
+endif ()
+
+include_directories (
+ libs/dsurf
+ libs/image
+ libs/lex
+ libs/rand
+ libs/stats
+ libs/timer
+ glh
+ ${GLEXT_INCLUDE_DIR}
+ ${OPENGL_INCLUDE_DIR}
+ ${TIFF_INCLUDE_DIR}
+)
+
+add_subdirectory(libs)
+add_subdirectory(glean)
+add_subdirectory(tools)
diff --git a/src/glean/CMakeLists.txt b/src/glean/CMakeLists.txt
new file mode 100644
index 0000000..5dc6661
--- /dev/null
+++ b/src/glean/CMakeLists.txt
@@ -0,0 +1,30 @@
+file (GLOB sources "*.cpp")
+
+add_executable (glean ${sources})
+
+target_link_libraries (glean
+ dsurf
+ lex
+ image
+ stats
+ timer
+ ${TIFF_LIBRARY}
+ ${OPENGL_gl_LIBRARY}
+ ${OPENGL_glu_LIBRARY}
+)
+
+if (WIN32)
+ target_link_libraries (glean
+ gdi32
+ user32
+ kernel32
+ )
+elseif (APPLE)
+ target_link_libraries (glean
+ ${CARBON_LIBRARY}
+ )
+else ()
+ target_link_libraries (glean
+ ${X11_X11_LIB}
+ )
+endif ()
diff --git a/src/libs/CMakeLists.txt b/src/libs/CMakeLists.txt
new file mode 100644
index 0000000..c5460c9
--- /dev/null
+++ b/src/libs/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_subdirectory (dsurf)
+add_subdirectory (image)
+add_subdirectory (lex)
+add_subdirectory (stats)
+add_subdirectory (timer)
diff --git a/src/libs/dsurf/CMakeLists.txt b/src/libs/dsurf/CMakeLists.txt
new file mode 100644
index 0000000..9cb0dcf
--- /dev/null
+++ b/src/libs/dsurf/CMakeLists.txt
@@ -0,0 +1,3 @@
+file (GLOB sources "*.cpp")
+
+add_library(dsurf ${sources})
diff --git a/src/libs/image/CMakeLists.txt b/src/libs/image/CMakeLists.txt
new file mode 100644
index 0000000..11dbad6
--- /dev/null
+++ b/src/libs/image/CMakeLists.txt
@@ -0,0 +1,3 @@
+file (GLOB sources "*.cpp")
+
+add_library(image ${sources})
diff --git a/src/libs/lex/CMakeLists.txt b/src/libs/lex/CMakeLists.txt
new file mode 100644
index 0000000..1f45075
--- /dev/null
+++ b/src/libs/lex/CMakeLists.txt
@@ -0,0 +1,3 @@
+file (GLOB sources "*.cpp")
+
+add_library(lex ${sources})
diff --git a/src/libs/stats/CMakeLists.txt b/src/libs/stats/CMakeLists.txt
new file mode 100644
index 0000000..eacb70a
--- /dev/null
+++ b/src/libs/stats/CMakeLists.txt
@@ -0,0 +1,3 @@
+file (GLOB sources "*.cpp")
+
+add_library(stats ${sources})
diff --git a/src/libs/timer/CMakeLists.txt b/src/libs/timer/CMakeLists.txt
new file mode 100644
index 0000000..69d5a99
--- /dev/null
+++ b/src/libs/timer/CMakeLists.txt
@@ -0,0 +1,3 @@
+file (GLOB sources "*.cpp")
+
+add_library(timer ${sources})
diff --git a/src/tiff/CMakeLists.txt b/src/tiff/CMakeLists.txt
new file mode 100644
index 0000000..d7404ee
--- /dev/null
+++ b/src/tiff/CMakeLists.txt
@@ -0,0 +1,113 @@
+include (CheckFunctionExists)
+include (CheckIncludeFile)
+include (TestBigEndian)
+include (CheckTypeSize)
+
+check_type_size (int SIZEOF_INT BUILTIN_TYPES_ONLY)
+check_type_size (long SIZEOF_LONG BUILTIN_TYPES_ONLY)
+check_type_size (int8 INT8)
+check_type_size (int16 INT16)
+check_type_size (int32 INT32)
+
+# Check for system headers
+check_include_file (assert.h HAVE_ASSERT_H)
+check_include_file (fcntl.h HAVE_FCNTL_H)
+check_include_file (limits.h HAVE_LIMITS_H)
+check_include_file (malloc.h HAVE_MALLOC_H)
+check_include_file (search.h HAVE_SEARCH_H)
+check_include_file (sys/time.h HAVE_SYS_TIME_H)
+check_include_file (unistd.h HAVE_UNISTD_H)
+check_include_file (string.h HAVE_STRING_H)
+check_include_file (windows.h HAVE_WINDOWS_H)
+
+# Check for standard library functions
+check_function_exists (floor HAVE_FLOOR)
+check_function_exists (isascii HAVE_ISASCII)
+check_function_exists (memmove HAVE_MEMMOVE)
+check_function_exists (memset HAVE_MEMSET)
+check_function_exists (mmap HAVE_MMAP)
+check_function_exists (pow HAVE_POW)
+check_function_exists (sqrt HAVE_SQRT)
+check_function_exists (strchr HAVE_STRCHR)
+check_function_exists (strrchr HAVE_STRRCHR)
+check_function_exists (strstr HAVE_STRSTR)
+check_function_exists (strtol HAVE_STRTOL)
+
+test_big_endian (HOST_BIGENDIAN)
+if (HOST_BIGENDIAN)
+ set (HOST_FILLORDER FILLORDER_MSB2LSB)
+else ()
+ set (HOST_FILLORDER FILLORDER_LSB2MSB)
+endif ()
+
+set (HAVE_IEEEFP 1)
+
+set (CCITT_SUPPORT 1)
+set (PACKBITS_SUPPORT 1)
+set (LZW_SUPPORT 1)
+set (THUNDER_SUPPORT 1)
+set (NEXT_SUPPORT 1)
+set (LOGLUV_SUPPORT 1)
+set (STRIP_CHOPPING_SUPPORT 1)
+set (EXTRASAMPLE_AS_ALPHA_SUPPORT 1)
+set (CHECK_YCBCR_SUBSAMPLING_SUPPORT 1)
+
+configure_file (tif_config.h.in tif_config.h)
+configure_file (tiffconf.h.in tiffconf.h)
+
+include_directories (${CMAKE_CURRENT_BINARY_DIR})
+
+set (sources
+ tif_aux.c
+ tif_close.c
+ tif_codec.c
+ tif_color.c
+ tif_compress.c
+ tif_dir.c
+ tif_dirinfo.c
+ tif_dirread.c
+ tif_dirwrite.c
+ tif_dumpmode.c
+ tif_error.c
+ tif_extension.c
+ tif_fax3.c
+ tif_fax3sm.c
+ tif_flush.c
+ tif_getimage.c
+ tif_jpeg.c
+ tif_luv.c
+ tif_lzw.c
+ tif_next.c
+ tif_ojpeg.c
+ tif_open.c
+ tif_packbits.c
+ tif_pixarlog.c
+ tif_predict.c
+ tif_print.c
+ tif_read.c
+ tif_strip.c
+ tif_swab.c
+ tif_thunder.c
+ tif_tile.c
+ tif_version.c
+ tif_warning.c
+ tif_write.c
+ tif_zip.c
+)
+
+if (MSVC)
+ set (inline __inline)
+else ()
+ set (inline inline)
+endif ()
+
+if (WIN32)
+ set (sources ${sources} tif_win32.c)
+elseif (APPLE)
+ set (sources ${sources} tif_apple.c)
+ include_directories (/Developer/Headers/FlatCarbon)
+else ()
+ set (sources ${sources} tif_unix.c)
+endif ()
+
+add_library(bundled_tiff ${sources})
diff --git a/src/tiff/tif_config.h.in b/src/tiff/tif_config.h.in
new file mode 100644
index 0000000..e86dc48
--- /dev/null
+++ b/src/tiff/tif_config.h.in
@@ -0,0 +1,260 @@
+/* libtiff/tif_config.h.in. Generated from configure.ac by autoheader. */
+
+/* Support CCITT Group 3 & 4 algorithms */
+#cmakedefine CCITT_SUPPORT
+
+/* Pick up YCbCr subsampling info from the JPEG data stream to support files
+ lacking the tag (default enabled). */
+#cmakedefine CHECK_JPEG_YCBCR_SUBSAMPLING
+
+/* Support C++ stream API (requires C++ compiler) */
+#cmakedefine CXX_SUPPORT
+
+/* Treat extra sample as alpha (default enabled). The RGBA interface will
+ treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many
+ packages produce RGBA files but don't mark the alpha properly. */
+#cmakedefine DEFAULT_EXTRASAMPLE_AS_ALPHA
+
+/* Use the Apple OpenGL framework. */
+#cmakedefine HAVE_APPLE_OPENGL_FRAMEWORK
+
+/* Define to 1 if you have the <assert.h> header file. */
+#cmakedefine HAVE_ASSERT_H
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#cmakedefine HAVE_DLFCN_H
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#cmakedefine HAVE_FCNTL_H
+
+/* Define to 1 if you have the `floor' function. */
+#cmakedefine HAVE_FLOOR
+
+/* Define to 1 if you have the `getopt' function. */
+#cmakedefine HAVE_GETOPT
+
+/* Define as 0 or 1 according to the floating point format suported by the
+ machine */
+#cmakedefine HAVE_IEEEFP
+
+/* Define to 1 if the system has the type `int16'. */
+#cmakedefine HAVE_INT16
+
+/* Define to 1 if the system has the type `int32'. */
+#cmakedefine HAVE_INT32
+
+/* Define to 1 if the system has the type `int8'. */
+#cmakedefine HAVE_INT8
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#cmakedefine HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `isascii' function. */
+#cmakedefine HAVE_ISASCII
+
+/* Define to 1 if you have the `lfind' function. */
+#cmakedefine HAVE_LFIND
+
+/* Define to 1 if you have the `c' library (-lc). */
+#cmakedefine HAVE_LIBC
+
+/* Define to 1 if you have the `m' library (-lm). */
+#cmakedefine HAVE_LIBM
+
+/* Define to 1 if you have the <limits.h> header file. */
+#cmakedefine HAVE_LIMITS_H
+
+/* Define to 1 if you have the <malloc.h> header file. */
+#cmakedefine HAVE_MALLOC_H
+
+/* Define to 1 if you have the `memmove' function. */
+#cmakedefine HAVE_MEMMOVE
+
+/* Define to 1 if you have the <memory.h> header file. */
+#cmakedefine HAVE_MEMORY_H
+
+/* Define to 1 if you have the `memset' function. */
+#cmakedefine HAVE_MEMSET
+
+/* Define to 1 if you have the `mmap' function. */
+#cmakedefine HAVE_MMAP
+
+/* Define to 1 if you have the `pow' function. */
+#cmakedefine HAVE_POW
+
+/* Define if you have POSIX threads libraries and header files. */
+#cmakedefine HAVE_PTHREAD
+
+/* Define to 1 if you have the <search.h> header file. */
+#cmakedefine HAVE_SEARCH_H
+
+/* Define to 1 if you have the `sqrt' function. */
+#cmakedefine HAVE_SQRT
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#cmakedefine HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#cmakedefine HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strcasecmp' function. */
+#cmakedefine HAVE_STRCASECMP
+
+/* Define to 1 if you have the `strchr' function. */
+#cmakedefine HAVE_STRCHR
+
+/* Define to 1 if you have the <strings.h> header file. */
+#cmakedefine HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#cmakedefine HAVE_STRING_H
+
+/* Define to 1 if you have the `strrchr' function. */
+#cmakedefine HAVE_STRRCHR
+
+/* Define to 1 if you have the `strstr' function. */
+#cmakedefine HAVE_STRSTR
+
+/* Define to 1 if you have the `strtol' function. */
+#cmakedefine HAVE_STRTOL
+
+/* Define to 1 if you have the `strtoul' function. */
+#cmakedefine HAVE_STRTOUL
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#cmakedefine HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#cmakedefine HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#cmakedefine HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#cmakedefine HAVE_UNISTD_H
+
+/* Define to 1 if you have the <windows.h> header file. */
+#cmakedefine HAVE_WINDOWS_H
+
+/* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
+ (Intel) */
+#cmakedefine HOST_BIGENDIAN
+
+/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
+#define HOST_FILLORDER @HOST_FILLORDER@
+
+/* Support JPEG compression (requires IJG JPEG library) */
+#cmakedefine JPEG_SUPPORT
+
+/* Support LogLuv high dynamic range encoding */
+#cmakedefine LOGLUV_SUPPORT
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#cmakedefine LT_OBJDIR
+
+/* Support LZW algorithm */
+#cmakedefine LZW_SUPPORT
+
+/* Support Microsoft Document Imaging format */
+#cmakedefine MDI_SUPPORT
+
+/* Support NeXT 2-bit RLE algorithm */
+#cmakedefine NEXT_SUPPORT
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#cmakedefine NO_MINUS_C_MINUS_O
+
+/* Support Old JPEG compresson (read contrib/ojpeg/README first! Compilation
+ fails with unpatched IJG JPEG library) */
+#cmakedefine OJPEG_SUPPORT
+
+/* Name of package */
+#cmakedefine PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#cmakedefine PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#cmakedefine PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#cmakedefine PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#cmakedefine PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#cmakedefine PACKAGE_VERSION
+
+/* Support Macintosh PackBits algorithm */
+#cmakedefine PACKBITS_SUPPORT
+
+/* Support Pixar log-format algorithm (requires Zlib) */
+#cmakedefine PIXARLOG_SUPPORT
+
+/* Define to necessary symbol if this constant uses a non-standard name on
+ your system. */
+#cmakedefine PTHREAD_CREATE_JOINABLE
+
+/* The size of a `int', as computed by sizeof. */
+#define SIZEOF_INT @SIZEOF_INT@
+
+/* The size of a `long', as computed by sizeof. */
+#define SIZEOF_LONG @SIZEOF_LONG@
+
+/* Define to 1 if you have the ANSI C header files. */
+#cmakedefine STDC_HEADERS
+
+/* Support strip chopping (whether or not to convert single-strip uncompressed
+ images to mutiple strips of specified size to reduce memory usage) */
+#cmakedefine STRIPCHOP_DEFAULT
+
+/* Default size of the strip in bytes (when strip chopping enabled) */
+#cmakedefine STRIP_SIZE_DEFAULT
+
+/* Enable SubIFD tag (330) support */
+#cmakedefine SUBIFD_SUPPORT
+
+/* Support ThunderScan 4-bit RLE algorithm */
+#cmakedefine THUNDER_SUPPORT
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#cmakedefine TIME_WITH_SYS_TIME
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+#cmakedefine TM_IN_SYS_TIME
+
+/* Version number of package */
+#undef VERSION
+
+/* Define to 1 if your processor stores words with the most significant byte
+ first (like Motorola and SPARC, unlike Intel and VAX). */
+#cmakedefine WORDS_BIGENDIAN
+
+/* Define to 1 if the X Window System is missing or not being used. */
+#cmakedefine X_DISPLAY_MISSING
+
+/* Support Deflate compression */
+#cmakedefine ZIP_SUPPORT
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#cmakedefine _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#cmakedefine _LARGE_FILES
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+ calls it, or to nothing if 'inline' is not supported under any name. */
+#ifndef __cplusplus
+#define inline @inline@
+#endif
+
+/* Define to `long' if <sys/types.h> does not define. */
+#undef off_t
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+#undef size_t
diff --git a/src/tiff/tiffconf.h b/src/tiff/tiffconf.h.in
similarity index 74%
rename from src/tiff/tiffconf.h
rename to src/tiff/tiffconf.h.in
index 18c0a1b..9cbf2cc 100644
--- a/src/tiff/tiffconf.h
+++ b/src/tiff/tiffconf.h.in
@@ -8,79 +8,82 @@
#define _TIFFCONF_
/* Define to 1 if the system has the type `int16'. */
-/* #undef HAVE_INT16 */
+#cmakedefine HAVE_INT16
/* Define to 1 if the system has the type `int32'. */
-/* #undef HAVE_INT32 */
+#cmakedefine HAVE_INT32
/* Define to 1 if the system has the type `int8'. */
-/* #undef HAVE_INT8 */
+#cmakedefine HAVE_INT8
/* The size of a `int', as computed by sizeof. */
-#define SIZEOF_INT 4
+#define SIZEOF_INT @SIZEOF_INT@
/* The size of a `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
+#define SIZEOF_LONG @SIZEOF_LONG@
/* Compatibility stuff. */
/* Define as 0 or 1 according to the floating point format suported by the
machine */
-#define HAVE_IEEEFP 1
+#cmakedefine HAVE_IEEEFP
/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
-#define HOST_FILLORDER FILLORDER_LSB2MSB
+#define HOST_FILLORDER @HOST_FILLORDER@
/* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
(Intel) */
-#define HOST_BIGENDIAN 0
+#cmakedefine HOST_BIGENDIAN
/* Support CCITT Group 3 & 4 algorithms */
-#define CCITT_SUPPORT 1
+#cmakedefine CCITT_SUPPORT
/* Support JPEG compression (requires IJG JPEG library) */
-/* #undef JPEG_SUPPORT */
+#cmakedefine JPEG_SUPPORT
/* Support LogLuv high dynamic range encoding */
-#define LOGLUV_SUPPORT 1
+#cmakedefine LOGLUV_SUPPORT
/* Support LZW algorithm */
-#define LZW_SUPPORT 1
+#cmakedefine LZW_SUPPORT
/* Support NeXT 2-bit RLE algorithm */
-#define NEXT_SUPPORT 1
+#cmakedefine NEXT_SUPPORT
/* Support Old JPEG compresson (read contrib/ojpeg/README first! Compilation
fails with unpatched IJG JPEG library) */
-/* #undef OJPEG_SUPPORT */
+#cmakedefine OJPEG_SUPPORT
/* Support Macintosh PackBits algorithm */
-#define PACKBITS_SUPPORT 1
+#cmakedefine PACKBITS_SUPPORT
/* Support Pixar log-format algorithm (requires Zlib) */
-/* #undef PIXARLOG_SUPPORT */
+#cmakedefine PIXARLOG_SUPPORT
/* Support ThunderScan 4-bit RLE algorithm */
-#define THUNDER_SUPPORT 1
+#cmakedefine THUNDER_SUPPORT
/* Support Deflate compression */
-/* #undef ZIP_SUPPORT */
+#cmakedefine ZIP_SUPPORT
/* Support strip chopping (whether or not to convert single-strip uncompressed
images to mutiple strips of ~8Kb to reduce memory usage) */
-#define STRIPCHOP_DEFAULT TIFF_STRIPCHOP
+#cmakedefine STRIPCHOP_DEFAULT
/* Enable SubIFD tag (330) support */
-#define SUBIFD_SUPPORT 1
+#cmakedefine SUBIFD_SUPPORT
/* Treat extra sample as alpha (default enabled). The RGBA interface will
treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many
packages produce RGBA files but don't mark the alpha properly. */
-#define DEFAULT_EXTRASAMPLE_AS_ALPHA 1
+#cmakedefine DEFAULT_EXTRASAMPLE_AS_ALPHA
/* Pick up YCbCr subsampling info from the JPEG data stream to support files
lacking the tag (default enabled). */
-#define CHECK_JPEG_YCBCR_SUBSAMPLING 1
+#cmakedefine CHECK_JPEG_YCBCR_SUBSAMPLING
+
+/* Support MS MDI magic number files as TIFF */
+#cmakedefine MDI_SUPPORT
/*
* Feature support definitions.
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
new file mode 100644
index 0000000..09a0fc8
--- /dev/null
+++ b/src/tools/CMakeLists.txt
@@ -0,0 +1,7 @@
+if (GLUT_FOUND)
+ add_subdirectory (difftiff)
+ add_subdirectory (showtiff)
+endif (GLUT_FOUND)
+
+add_subdirectory (showvis)
+
diff --git a/src/tools/difftiff/CMakeLists.txt b/src/tools/difftiff/CMakeLists.txt
new file mode 100644
index 0000000..b7436af
--- /dev/null
+++ b/src/tools/difftiff/CMakeLists.txt
@@ -0,0 +1,31 @@
+file (GLOB sources "*.cpp")
+
+add_executable (difftiff ${sources})
+
+target_link_libraries (difftiff
+ dsurf
+ lex
+ image
+ stats
+ timer
+ ${TIFF_LIBRARY}
+ ${OPENGL_gl_LIBRARY}
+ ${OPENGL_glu_LIBRARY}
+ ${GLUT_glut_LIBRARY}
+)
+
+if (WIN32)
+ target_link_libraries (difftiff
+ gdi32
+ user32
+ kernel32
+ )
+elseif (APPLE)
+ target_link_libraries (difftiff
+ ${CARBON_LIBRARY}
+ )
+else ()
+ target_link_libraries (difftiff
+ ${X11_X11_LIB}
+ )
+endif ()
diff --git a/src/tools/showtiff/CMakeLists.txt b/src/tools/showtiff/CMakeLists.txt
new file mode 100644
index 0000000..8b9bbf8
--- /dev/null
+++ b/src/tools/showtiff/CMakeLists.txt
@@ -0,0 +1,31 @@
+file (GLOB sources "*.cpp")
+
+add_executable (showtiff ${sources})
+
+target_link_libraries (showtiff
+ dsurf
+ lex
+ image
+ stats
+ timer
+ ${TIFF_LIBRARY}
+ ${OPENGL_gl_LIBRARY}
+ ${OPENGL_glu_LIBRARY}
+ ${GLUT_glut_LIBRARY}
+)
+
+if (WIN32)
+ target_link_libraries (showtiff
+ gdi32
+ user32
+ kernel32
+ )
+elseif (APPLE)
+ target_link_libraries (showtiff
+ ${CARBON_LIBRARY}
+ )
+else ()
+ target_link_libraries (showtiff
+ ${X11_X11_LIB}
+ )
+endif ()
diff --git a/src/tools/showvis/CMakeLists.txt b/src/tools/showvis/CMakeLists.txt
new file mode 100644
index 0000000..c6d6739
--- /dev/null
+++ b/src/tools/showvis/CMakeLists.txt
@@ -0,0 +1,30 @@
+file (GLOB sources "*.cpp")
+
+add_executable (showvis ${sources})
+
+target_link_libraries (showvis
+ dsurf
+ lex
+ image
+ stats
+ timer
+ ${TIFF_LIBRARY}
+ ${OPENGL_glu_LIBRARY}
+ ${OPENGL_gl_LIBRARY}
+)
+
+if (WIN32)
+ target_link_libraries (showvis
+ gdi32
+ user32
+ kernel32
+ )
+elseif (APPLE)
+ target_link_libraries (showvis
+ ${CARBON_LIBRARY}
+ )
+else ()
+ target_link_libraries (showvis
+ ${X11_X11_LIB}
+ )
+endif ()
|
|
From: Jose F. <jrf...@us...> - 2011-07-15 15:14:57
|
Module: glean Branch: cmake Commit: 19c302331cea544fc66b16a00d411511991a0c08 URL: no.cgit.repo/commit/?id=19c302331cea544fc66b16a00d411511991a0c08 Author: José Fonseca <jfo...@vm...> Date: Fri Jul 15 16:14:00 2011 +0100 Revert "Use static MSVC runtime." Creates havoc when linking against certain libraries. This reverts commit 81469c15be2a5abc49616fd6e51b74dba2b1fbb7. --- src/CMakeLists.txt | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 814fe30..384f6c3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -38,17 +38,6 @@ else () add_definitions (-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS) add_definitions (-D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS) - - # Use static runtime - # http://www.cmake.org/Wiki/CMake_FAQ#How_can_I_build_my_MSVC_application_with_a_static_runtime.3F - foreach (flag_var - CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO - CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO - ) - if (${flag_var} MATCHES "/MD") - string (REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") - endif (${flag_var} MATCHES "/MD") - endforeach (flag_var) endif () if (APPLE) |
|
From: Jose F. <jrf...@us...> - 2011-07-15 15:14:54
|
Module: glean
Branch: cmake
Commit: 78a8b28ff19e6391763d4da4fce8e47d51b3779b
URL: no.cgit.repo/commit/?id=78a8b28ff19e6391763d4da4fce8e47d51b3779b
Author: José Fonseca <jfo...@vm...>
Date: Fri Jul 15 16:09:17 2011 +0100
Add GLUT include dir only where necessary.
---
src/CMakeLists.txt | 1 -
src/tools/difftiff/CMakeLists.txt | 2 ++
src/tools/showtiff/CMakeLists.txt | 2 ++
3 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cebb8ef..814fe30 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -82,7 +82,6 @@ include_directories (
libs/timer
glh
${GLEXT_INCLUDE_DIR}
- ${GLUT_INCLUDE_DIR}
${OPENGL_INCLUDE_DIR}
${TIFF_INCLUDE_DIR}
)
diff --git a/src/tools/difftiff/CMakeLists.txt b/src/tools/difftiff/CMakeLists.txt
index 1a2e362..0bb72f2 100644
--- a/src/tools/difftiff/CMakeLists.txt
+++ b/src/tools/difftiff/CMakeLists.txt
@@ -1,3 +1,5 @@
+include_directories (${GLUT_INCLUDE_DIR})
+
file (GLOB sources "*.cpp")
add_executable (difftiff ${sources})
diff --git a/src/tools/showtiff/CMakeLists.txt b/src/tools/showtiff/CMakeLists.txt
index c219dd1..009889d 100644
--- a/src/tools/showtiff/CMakeLists.txt
+++ b/src/tools/showtiff/CMakeLists.txt
@@ -1,3 +1,5 @@
+include_directories (${GLUT_INCLUDE_DIR})
+
file (GLOB sources "*.cpp")
add_executable (showtiff ${sources})
|
|
From: Jose F. <jrf...@us...> - 2011-07-15 15:14:50
|
Module: glean
Branch: cmake
Commit: 84e246932ed8f994c595f57a272e7d34664e509d
URL: no.cgit.repo/commit/?id=84e246932ed8f994c595f57a272e7d34664e509d
Author: José Fonseca <jfo...@vm...>
Date: Fri Jul 15 16:08:50 2011 +0100
Fix MacOSX build.
---
src/CMakeLists.txt | 8 ++++++--
src/tiff/CMakeLists.txt | 2 ++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 217b52a..cebb8ef 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -51,7 +51,10 @@ else ()
endforeach (flag_var)
endif ()
-set (GLEXT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/glext)
+if (APPLE)
+ # We rely on frameworks which where deprecated on x86-64
+ set (CMAKE_OSX_ARCHITECTURES i386)
+endif ()
if (NOT TIFF_FOUND)
set (TIFF_INCLUDE_DIR ${CMAKE_BINARY_DIR}/tiff ${CMAKE_SOURCE_DIR}/tiff)
@@ -59,12 +62,13 @@ if (NOT TIFF_FOUND)
add_subdirectory (tiff)
endif ()
+set (GLEXT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/glext)
+
if (WIN32)
add_definitions (-D__WIN__ -D__MS__)
elseif (APPLE)
add_definitions (-D__AGL__ -D__UNIX__)
find_library (CARBON_LIBRARY Carbon)
- set (CMAKE_OSX_ARCHITECTURES i386)
else ()
add_definitions (-D__X11__ -D__UNIX__)
endif ()
diff --git a/src/tiff/CMakeLists.txt b/src/tiff/CMakeLists.txt
index d7404ee..1e736da 100644
--- a/src/tiff/CMakeLists.txt
+++ b/src/tiff/CMakeLists.txt
@@ -20,6 +20,8 @@ check_include_file (unistd.h HAVE_UNISTD_H)
check_include_file (string.h HAVE_STRING_H)
check_include_file (windows.h HAVE_WINDOWS_H)
+set (HAVE_APPLE_OPENGL_FRAMEWORK ${APPLE})
+
# Check for standard library functions
check_function_exists (floor HAVE_FLOOR)
check_function_exists (isascii HAVE_ISASCII)
|
|
From: Jose F. <jrf...@us...> - 2011-07-15 15:14:47
|
Module: glean Branch: cmake Commit: c06c131d79abaea87bc97548163c5fd9ac39e119 URL: no.cgit.repo/commit/?id=c06c131d79abaea87bc97548163c5fd9ac39e119 Author: José Fonseca <jfo...@vm...> Date: Fri Jul 15 16:08:28 2011 +0100 Don't depend on glut to get proc addresses on MacOSX. dlsym() is all one needs. --- src/glean/glutils.cpp | 4 ++-- src/glh/glwrap.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/glean/glutils.cpp b/src/glean/glutils.cpp index 2c8ab60..70cf0cc 100644 --- a/src/glean/glutils.cpp +++ b/src/glean/glutils.cpp @@ -37,7 +37,7 @@ #include "environ.h" #include "lex.h" #include "glutils.h" -#if defined(__X11__) +#if defined(__X11__) || defined(__AGL__) # include <dlfcn.h> #endif #if defined(__AGL__) @@ -141,7 +141,7 @@ void # error "Need GetProcAddress (or equivalent) for BeOS" return 0; #elif defined(__AGL__) - return reinterpret_cast<void (*)()>(glutGetProcAddress(name)); + return reinterpret_cast<void (*)()>(dlsym(RTLD_DEFAULT, name)); #endif } // getProcAddress diff --git a/src/glh/glwrap.h b/src/glh/glwrap.h index 8463eb3..91e5d48 100644 --- a/src/glh/glwrap.h +++ b/src/glh/glwrap.h @@ -74,7 +74,6 @@ # include <Carbon/Carbon.h> # include <OpenGL/glu.h> # include <OpenGL/glext.h> -# include <GLUT/glut.h> # include <AGL/agl.h> # include <AGL/aglRenderers.h> # if !defined(APIENTRY) |
|
From: Jose F. <jrf...@us...> - 2011-07-15 14:42:36
|
Module: glean Branch: cmake Commit: 81469c15be2a5abc49616fd6e51b74dba2b1fbb7 URL: no.cgit.repo/commit/?id=81469c15be2a5abc49616fd6e51b74dba2b1fbb7 Author: José Fonseca <jfo...@vm...> Date: Fri Jul 15 15:42:08 2011 +0100 Use static MSVC runtime. Avoids having to install the MSVC redistributable runtime. --- src/CMakeLists.txt | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 981179d..217b52a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -38,6 +38,17 @@ else () add_definitions (-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS) add_definitions (-D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS) + + # Use static runtime + # http://www.cmake.org/Wiki/CMake_FAQ#How_can_I_build_my_MSVC_application_with_a_static_runtime.3F + foreach (flag_var + CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO + CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO + ) + if (${flag_var} MATCHES "/MD") + string (REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") + endif (${flag_var} MATCHES "/MD") + endforeach (flag_var) endif () set (GLEXT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/glext) |
|
From: Jose F. <jrf...@us...> - 2011-07-15 13:58:38
|
Module: glean
Branch: cmake
Commit: bed6d2bdd630fee36e6f1320ea8d2b7f251b8e09
URL: no.cgit.repo/commit/?id=bed6d2bdd630fee36e6f1320ea8d2b7f251b8e09
Author: José Fonseca <jfo...@vm...>
Date: Fri Jul 15 14:53:06 2011 +0100
Put all executables into the bin subdirectory.
---
src/CMakeLists.txt | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5651e4f..981179d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,6 +9,17 @@ find_package(OpenGL REQUIRED)
find_package(TIFF)
find_package(GLUT)
+# Put all executables into the bin subdirectory
+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+
+# Do the same for MSVC, regardless of the build type. This only works correctly
+# for CMake 2.8.1 and above.
+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin)
+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin)
+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_BINARY_DIR}/bin)
+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR}/bin)
+
if (NOT MSVC)
check_c_compiler_flag ("-Wall" C_COMPILER_FLAG_WALL)
if (C_COMPILER_FLAG_WALL)
|
|
From: Jose F. <jrf...@us...> - 2011-07-15 13:58:35
|
Module: glean
Branch: cmake
Commit: 1f4dbe7e9f9f7dbcfe3b084aeeccb89365c68da7
URL: no.cgit.repo/commit/?id=1f4dbe7e9f9f7dbcfe3b084aeeccb89365c68da7
Author: José Fonseca <jfo...@vm...>
Date: Fri Jul 15 14:52:56 2011 +0100
Add the glut include path.
---
src/CMakeLists.txt | 1 +
src/tools/difftiff/CMakeLists.txt | 4 ++--
src/tools/showtiff/CMakeLists.txt | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5b807e9..5651e4f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -56,6 +56,7 @@ include_directories (
libs/timer
glh
${GLEXT_INCLUDE_DIR}
+ ${GLUT_INCLUDE_DIR}
${OPENGL_INCLUDE_DIR}
${TIFF_INCLUDE_DIR}
)
diff --git a/src/tools/difftiff/CMakeLists.txt b/src/tools/difftiff/CMakeLists.txt
index b7436af..1a2e362 100644
--- a/src/tools/difftiff/CMakeLists.txt
+++ b/src/tools/difftiff/CMakeLists.txt
@@ -9,9 +9,9 @@ target_link_libraries (difftiff
stats
timer
${TIFF_LIBRARY}
- ${OPENGL_gl_LIBRARY}
- ${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
+ ${OPENGL_glu_LIBRARY}
+ ${OPENGL_gl_LIBRARY}
)
if (WIN32)
diff --git a/src/tools/showtiff/CMakeLists.txt b/src/tools/showtiff/CMakeLists.txt
index 8b9bbf8..c219dd1 100644
--- a/src/tools/showtiff/CMakeLists.txt
+++ b/src/tools/showtiff/CMakeLists.txt
@@ -9,9 +9,9 @@ target_link_libraries (showtiff
stats
timer
${TIFF_LIBRARY}
- ${OPENGL_gl_LIBRARY}
- ${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
+ ${OPENGL_glu_LIBRARY}
+ ${OPENGL_gl_LIBRARY}
)
if (WIN32)
|
69 messages has been excluded from this view by a project administrator.
