| Commit message (Collapse) | Author | Files | Lines |
|
Use pkg_check_modules to find freealut (and openal) for STANDALONE.
Non-standalone is untouched by this version.
The changes relative to snowglobe (for the STANDALONE path) is
that I removed the 'include(FindOpenAL) (that comes with cmake)
which not only doesn't find libalut, but even sets the wrong
cmake variables (it sets OPENAL_LIBRARY, and our cmake scripts
*use* OPENAL_LIBRARIES). Moreover, under the assumption that
STANDALONE really is only for linux (and I think that is so),
every linux distribution DOES have freealut (and openal) installed
with a pkg-config anyway. I also removed pkg_check_modules(openal)
because it is redundant: freealut pulls that in already.
|
|
Use pkg_check_modules to find freealut (and openal) for STANDALONE.
Non-standalone is untouched by this version.
The changes relative to snowglobe (for the STANDALONE path) is
that I removed the 'include(FindOpenAL) (that comes with cmake)
which not only doesn't find libalut, but even sets the wrong
cmake variables (it sets OPENAL_LIBRARY, and our cmake scripts
*use* OPENAL_LIBRARIES). Moreover, under the assumption that
STANDALONE really is only for linux (and I think that is so),
every linux distribution DOES have freealut (and openal) installed
with a pkg-config anyway. I also removed pkg_check_modules(openal)
because it is redundant: freealut pulls that in already.
|
|
Revert the changes introduced in
http://github.com/AlericInglewood/imprudence/commit/e71d3ea2fad63fa2ec81685a9b09c1bed6b493be
|
|
Note that indra/cmake/CMakeLists.txt is missing on imprudence, so
I couldn't add 'FindZLIB.cmake' to the list of source files
(see
http://svn.secondlife.com/trac/linden/browser/projects/2009/snowglobe/trunk/indra/cmake/CMakeLists.txt)
I added a comment to
http://github.com/mccabe/imprudence/commit/39f625963e408ec5dd394e202506700259b9b508
that adds an empty indra/cmake/CMakeLists.txt
If Jacek follows up and copies snowglobe's CMakeLists.txt then she'll
have to remove the FindZLIB.cmake from it if she tests it before
merging with THIS commit. In that case it has to be added back when
merging that commit with this one.
Tested on imprudence with cmake 2.8.2:
* Without patch, 'configure' takes 100 seconds.
* With patch, 'configure' takes 4 seconds.
|
|
This patch only affects --standalone. It was basically ported
from Snowglobe with the following change: If LL_TESTS is not
set, then tut.h is not required (this is an improvement,
because if LL_TESTS is not set no tests should be created or run).
I tested it with -DLL_TESTS:BOOL=ON, -DLL_TESTS:BOOL=OFF and
no -DLL_TESTS* at all, with and without tut installed, internally
and externally. Things worked as expected. Most notably, with
tut.h installed in libraries/include/, it is NOT found. This is
necessary because using -Ilibraries/include for standalone is
a no no: prebuilt stuff might be downloaded, but we don't want
to use it! That directory contains potentially many other libraries.
|
|
See http://redmine.imprudenceviewer.org/issues/561
Fixed erroneous use of optimization flags when not compiling Release.
Also removed -DLL_VECTORIZE from compile options: that is set in
a header file (llv4math.h), not on the commandline.
Patch affects only 64 bit linux.
|
|
See http://redmine.imprudenceviewer.org/issues/552
Add FindNDOF.cmake and treat it like every other library (on
standalone).
|
|
Note that indra/cmake/CMakeLists.txt is missing on imprudence, so
I couldn't add 'FindZLIB.cmake' to the list of source files
(see
http://svn.secondlife.com/trac/linden/browser/projects/2009/snowglobe/trunk/indra/cmake/CMakeLists.txt)
I added a comment to
http://github.com/mccabe/imprudence/commit/39f625963e408ec5dd394e202506700259b9b508
that adds an empty indra/cmake/CMakeLists.txt
If Jacek follows up and copies snowglobe's CMakeLists.txt then she'll
have to remove the FindZLIB.cmake from it if she tests it before
merging with THIS commit. In that case it has to be added back when
merging that commit with this one.
Tested on imprudence with cmake 2.8.2:
* Without patch, 'configure' takes 100 seconds.
* With patch, 'configure' takes 4 seconds.
|
|
This patch only affects --standalone. It was basically ported
from Snowglobe with the following change: If LL_TESTS is not
set, then tut.h is not required (this is an improvement,
because if LL_TESTS is not set no tests should be created or run).
I tested it with -DLL_TESTS:BOOL=ON, -DLL_TESTS:BOOL=OFF and
no -DLL_TESTS* at all, with and without tut installed, internally
and externally. Things worked as expected. Most notably, with
tut.h installed in libraries/include/, it is NOT found. This is
necessary because using -Ilibraries/include for standalone is
a no no: prebuilt stuff might be downloaded, but we don't want
to use it! That directory contains potentially many other libraries.
|
|
See http://redmine.imprudenceviewer.org/issues/561
Fixed erroneous use of optimization flags when not compiling Release.
Also removed -DLL_VECTORIZE from compile options: that is set in
a header file (llv4math.h), not on the commandline.
Patch affects only 64 bit linux.
|
|
See http://redmine.imprudenceviewer.org/issues/560
|
|
See http://redmine.imprudenceviewer.org/issues/552
Add FindNDOF.cmake and treat it like every other library (on
standalone).
|
|
"CMake Warning (dev) at CMakeLists.txt:36 (add_subdirectory):
The source directory
/home/jacek/imprudence/linden/indra/cmake
does not contain a CMakeLists.txt file.
CMake does not support this case but it used to work accidentally and
is being allowed for compatibility.
Policy CMP0014 is not set: Input directories must have CMakeLists.txt.
Run "cmake --help-policy CMP0014" for policy details. Use the
cmake_policy command to set the policy and suppress this warning.
This warning is for project developers. Use -Wno-dev to suppress it."
|
|
due to an undocumented feature of find_xxx functions in CMake, no
additional libraries may be found after the first call to a find_xxx
function that searches the prebuilt libraries folder. CMake will request
the folder contents *at most once* and libraries added by install.py
will be missed.
|
|
transparency
todo: do it less hacky
|
|
|
|
dependencies
|
|
dependencies
|
|
|
|
|
|
Contains DejaVu Sans Condensed, Liberation Sans, and Vera Mono.
|
|
|
|
my custom builds were linking against /usr/local/lib/libjpeg.8.dylib and
causing a version mismatch error when trying to use JPEGs
|
|
to cmake
|
|
modularsystems.sl should be changed!
|
|
|
|
|
|
|
|
|
|
|
|
(Backported from aa251ea5) @nochangelog
|
|
(Backported from 6d50eb4a) @nochangelog
|
|
(Backported from d057e71bc) @nochangelog
|
|
(Reverts part of commit 30945b74.)
|
|
|
|
* Don't build with libELFIO (lib not working).
* Use shared libpng12 instead of static library
(fixes mozlib incompat for users with system libpng14).
|
|
|
|
|
|
|
|
|
|
(Cherry picked by Jacek from f604a685)
|
|
(Cherry picked by Jacek from 2e96ac24)
|
|
(Cherry picked by Jacek from 13412855)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|