From c06ab52c554ede2eb911277d17a6846733c370a5 Mon Sep 17 00:00:00 2001 From: James Turner Date: Wed, 22 Aug 2012 00:10:00 +0100 Subject: [PATCH] KIll off ALUT now it's gone from SimGear --- CMakeLists.txt | 2 - CMakeModules/ConfigureMsvc3rdParty.cmake | 1 - CMakeModules/FindALUT.cmake | 67 ------------------------ CMakeModules/FindSimGear.cmake | 1 - README.OpenAL | 9 ---- docs-mini/README.mingw | 39 -------------- package/mac/build-mac-nightly-dmg.rb | 10 ---- package/openSUSE/FlightGear.spec | 1 - tests/alcinfo.cxx | 25 +-------- 9 files changed, 1 insertion(+), 154 deletions(-) delete mode 100644 CMakeModules/FindALUT.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 85f1982ef..d0ef8c4fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,7 +144,6 @@ find_package(ZLIB REQUIRED) find_package(Threads REQUIRED) find_package(OpenGL REQUIRED) find_package(OpenAL REQUIRED) -find_package(ALUT REQUIRED) find_package(OpenSceneGraph 3.0.0 REQUIRED osgText osgSim osgDB osgParticle osgFX osgUtil osgViewer osgGA) if(ENABLE_FGADMIN) @@ -249,7 +248,6 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MSVC_LD_FLAGS}") include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} - ${ALUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${OPENAL_INCLUDE_DIR} ${SIMGEAR_INCLUDE_DIR} diff --git a/CMakeModules/ConfigureMsvc3rdParty.cmake b/CMakeModules/ConfigureMsvc3rdParty.cmake index 23d488755..1230ef30b 100644 --- a/CMakeModules/ConfigureMsvc3rdParty.cmake +++ b/CMakeModules/ConfigureMsvc3rdParty.cmake @@ -38,6 +38,5 @@ if (MSVC AND MSVC_3RDPARTY_ROOT) set (CMAKE_INCLUDE_PATH ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/OpenScenegraph/include ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/SimGear/include) set (BOOST_ROOT ${MSVC_3RDPARTY_ROOT}/boost_1_44_0) set (OPENAL_INCLUDE_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include) - set (ALUT_INCLUDE_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include) set (OPENAL_LIBRARY_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib) endif (MSVC AND MSVC_3RDPARTY_ROOT) diff --git a/CMakeModules/FindALUT.cmake b/CMakeModules/FindALUT.cmake deleted file mode 100644 index 48e6e0425..000000000 --- a/CMakeModules/FindALUT.cmake +++ /dev/null @@ -1,67 +0,0 @@ -# Locate ALUT -# This module defines -# ALUT_LIBRARY -# ALUT_FOUND, if false, do not try to link to ALUT -# ALUT_INCLUDE_DIR, where to find the headers -# -# $ALUTDIR is an environment variable that would -# correspond to the ./configure --prefix=$ALUTDIR -# used in building ALUT. -# -# Created by James Turner. This was influenced by the FindOpenAL.cmake module. - -#============================================================================= -# Copyright 2005-2009 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distributed this file outside of CMake, substitute the full -# License text for the above reference.) - -# Per my request, CMake should search for frameworks first in -# the following order: -# ~/Library/Frameworks/OpenAL.framework/Headers -# /Library/Frameworks/OpenAL.framework/Headers -# /System/Library/Frameworks/OpenAL.framework/Headers -# -# On OS X, this will prefer the Framework version (if found) over others. -# People will have to manually change the cache values of -# OPENAL_LIBRARY to override this selection or set the CMake environment -# CMAKE_INCLUDE_PATH to modify the search paths. - -FIND_LIBRARY(ALUT_LIBRARY - NAMES ALUT alut - HINTS - $ENV{ALUTDIR} - PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64 - PATHS - ~/Library/Frameworks - /Library/Frameworks - /usr/local - /usr - /opt -) - -FIND_PATH(ALUT_INCLUDE_DIR - NAMES ALUT/alut.h alut.h - HINTS - $ENV{ALUTDIR} - PATH_SUFFIXES include/AL include - PATHS - ~/Library/Frameworks - /Library/Frameworks - /usr/local - /usr - /opt -) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALUT DEFAULT_MSG ALUT_LIBRARY ALUT_INCLUDE_DIR) - -MARK_AS_ADVANCED(ALUT_LIBRARY ALUT_INCLUDE_DIR) - diff --git a/CMakeModules/FindSimGear.cmake b/CMakeModules/FindSimGear.cmake index 580bb78f5..448ff70e9 100644 --- a/CMakeModules/FindSimGear.cmake +++ b/CMakeModules/FindSimGear.cmake @@ -196,7 +196,6 @@ else(SIMGEAR_SHARED) ${WINMM_LIBRARY}) set(SIMGEAR_SCENE_LIBRARY_DEPENDENCIES - ${ALUT_LIBRARY} ${OPENAL_LIBRARY}) if(WIN32) diff --git a/README.OpenAL b/README.OpenAL index 7c0cd01f1..f21c656ab 100644 --- a/README.OpenAL +++ b/README.OpenAL @@ -18,12 +18,3 @@ ccmake . then press 'g' to generate and exit ] -The alut library is also required, but comes separately in the package -freelut-1.1.0.tar.gz. This package can be downloaded from the same page -(http://connect.creativelabs.com/openal/default.aspx). Download and run: -tar xzvf freelut-1.1.0.tar.gz -cd freealut-1.1.0 -./configure -make -sudo make install - diff --git a/docs-mini/README.mingw b/docs-mini/README.mingw index 757cd9512..ff48a1a70 100644 --- a/docs-mini/README.mingw +++ b/docs-mini/README.mingw @@ -62,44 +62,6 @@ patch header: #ifndef NEED_FTIME #include -GLUT -==== - -use precompiled in order to avoid conflicts with glut32.dll already installed. - -http://www.xmission.com/~nate/glut.html -http://www.xmission.com/~nate/glut/glut-3.7.6-bin.zip - -The header has to be updated with respect to MINGW. - -*** glut.h Tue Dec 12 22:22:52 2000 ---- /local_old/include/GL/glut.h Thu Aug 18 20:41:15 2005 -*************** -*** 20,26 **** - /* XXX This is from Win32's */ - # ifndef APIENTRY - # define GLUT_APIENTRY_DEFINED -! # if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC__) || defined(__LCC__) - # define APIENTRY __stdcall - # else - # define APIENTRY ---- 20,26 ---- - /* XXX This is from Win32's */ - # ifndef APIENTRY - # define GLUT_APIENTRY_DEFINED -! # if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC__) || defined(__LCC__) || defined(__MINGW32__) - # define APIENTRY __stdcall - # else - # define APIENTRY - - -install: -cp glut.h /usr/local/include -cp glut32.dll /usr/local/bin - -reimp glut32.lib -cp libglut32.a /usr/local/lib - OpenAL ====== @@ -114,7 +76,6 @@ install: cd libs reimp OpenAL32.lib cp libopenal32.a /usr/local/lib -cp alut.lib /usr/local/lib/libalut.a cd .. mkdir /usr/local/include/AL cp Include/* /usr/local/include/AL diff --git a/package/mac/build-mac-nightly-dmg.rb b/package/mac/build-mac-nightly-dmg.rb index 43675a56d..967cb60f3 100755 --- a/package/mac/build-mac-nightly-dmg.rb +++ b/package/mac/build-mac-nightly-dmg.rb @@ -20,8 +20,6 @@ puts "Code signing identity is #{$codeSignIdentity}" puts "osgVersion=#{osgVersion}, so-number=#{$osgSoVersion}" -$alutSourcePath='/Library/Frameworks/ALUT.framework' - $svnLibs = ['svn_client', 'svn_wc', 'svn_delta', 'svn_diff', 'svn_ra', 'svn_ra_local', 'svn_repos', 'svn_fs', 'svn_fs_fs', 'svn_fs_util', 'svn_ra_svn', 'svn_subr', 'svn_ra_neon'] @@ -38,10 +36,6 @@ def fix_install_names(object) oldName = "libOpenThreads.#{$openThreadsSoVersion}.dylib" newName= "@executable_path/../Frameworks/#{oldName}" `install_name_tool -change #{oldName} #{newName} #{object}` - - alutBundlePath = "@executable_path/../Frameworks/Alut.framework" - alutLib = "Versions/A/ALUT" - `install_name_tool -change #{$alutSourcePath}/#{alutLib} #{alutBundlePath}/#{alutLib} #{object}` end $prefixDir=Dir.pwd + "/dist" @@ -126,10 +120,6 @@ end copy_svn_libs() -# custom ALUT -# must copy frameworks using ditto -`ditto #{$alutSourcePath} #{$frameworksDir}/ALUT.framework` - # Info.plist template = File.read("#{srcDir}/package/mac/nightly.plist.in") output = ERB.new(template).result(binding) diff --git a/package/openSUSE/FlightGear.spec b/package/openSUSE/FlightGear.spec index be2010d52..561e20f7b 100644 --- a/package/openSUSE/FlightGear.spec +++ b/package/openSUSE/FlightGear.spec @@ -14,7 +14,6 @@ BuildRequires: update-desktop-files BuildRequires: SimGear = %{version}, SimGear-devel = %{version} BuildRequires: libOpenSceneGraph-devel >= 3.0 BuildRequires: subversion-devel, libapr1-devel -BuildRequires: freealut, freealut-devel BuildRequires: libopenal1-soft, openal-soft BuildRequires: zlib, zlib-devel BuildRequires: libfreetype6 diff --git a/tests/alcinfo.cxx b/tests/alcinfo.cxx index 85d2a27ec..e567d73cd 100644 --- a/tests/alcinfo.cxx +++ b/tests/alcinfo.cxx @@ -151,30 +151,7 @@ int main(int argc, char **argv) s = (char *)alGetString(AL_EXTENSIONS); printExtensions ("OpenAL extensions", ' ', s); - testForALCError(device); - -/* alut testing mechanism */ - context = alcGetCurrentContext(); - if (context == NULL) - { - printf("Error: no current context\n"); - } - else - { - if (alGetError () != AL_NO_ERROR) - { - printf("Alert: AL error on entry\n"); - } - else - { - if (alcGetError (alcGetContextsDevice (context)) != ALC_NO_ERROR) - { - printf("Alert: ALC error on entry\n"); - } - } - } -/* end of alut test */ - + testForALCError(device); if (alcMakeContextCurrent(NULL) == 0) printf("alcMakeContextCurrent failed.\n"); -- 2.39.2