Hi Erik,
I need attached patch to compile the new sound system on Windows.
I use alut/openal headers and libs from Frederic:
ftp://ftp.ihg.uni-duisburg.de/FlightGear/Win32/MSVC/fgfs-win32-VS90-3rdParty+OSG-20090820.zip
Cheers,
Olaf
BTW: If you are doing commits: Please remove my MSVC80 project files
from the flightgear repository. project/VC80. I will not update them any
more.
>From 306a7affdf40ebc28fe3be32d5fa88652a3d522e Mon Sep 17 00:00:00 2001
From: Olaf Flebbe <o...@oflebbe.de>
Date: Thu, 15 Oct 2009 22:33:55 +0200
Subject: [PATCH 09/10] Use openal headers according to freds file system layout,
aluterror issue
---
simgear/sound/sample_group.hxx | 2 --
simgear/sound/soundmgr_openal.cxx | 2 ++
simgear/sound/soundmgr_openal.hxx | 4 ----
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/simgear/sound/sample_group.hxx b/simgear/sound/sample_group.hxx
index 70b844c..f5b8c5f 100644
--- a/simgear/sound/sample_group.hxx
+++ b/simgear/sound/sample_group.hxx
@@ -35,8 +35,6 @@
#if defined(__APPLE__)
# include <OpenAL/al.h>
-#elif defined(_WIN32)
-# include <al.h>
#else
# include <AL/al.h>
#endif
diff --git a/simgear/sound/soundmgr_openal.cxx
b/simgear/sound/soundmgr_openal.cxx
index c8bd635..7fa3a1f 100644
--- a/simgear/sound/soundmgr_openal.cxx
+++ b/simgear/sound/soundmgr_openal.cxx
@@ -502,6 +502,7 @@ bool SGSoundMgr::load(string &samplepath, void **dbuf, int
*fmt,
ALboolean loop;
alutLoadWAVFile( fname, &format, &data, &size, &freq, &loop );
# endif
+#if defined(ALUT_API_MAJOR_VERSION) && ALUT_API_MAJOR_VERSION >= 1
ALenum error = alutGetError();
if ( error != ALUT_ERROR_NO_ERROR ) {
string msg = "Failed to load wav file: ";
@@ -510,6 +511,7 @@ bool SGSoundMgr::load(string &samplepath, void **dbuf, int
*fmt,
return false;
}
#endif
+#endif
*dbuf = (void *)data;
*fmt = (int)format;
diff --git a/simgear/sound/soundmgr_openal.hxx
b/simgear/sound/soundmgr_openal.hxx
index e2e2be4..e6669a1 100644
--- a/simgear/sound/soundmgr_openal.hxx
+++ b/simgear/sound/soundmgr_openal.hxx
@@ -47,10 +47,6 @@
# include <OpenAL/al.h>
# include <OpenAL/alc.h>
# include <OpenAL/alut.h>
-#elif defined(_WIN32)
-# include <al.h>
-# include <alc.h>
-# include <AL/alut.h>
#else
# include <AL/al.h>
# include <AL/alc.h>
--
1.6.4.msysgit.0
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
