Changeset 140

Timestamp:

08/29/10 23:29:03 (18 months ago)

Author:

Carsten

Message:

More 64-bit Windows build fixes.

Location:

cafu/trunk/Libs

Files:

• SConscript (modified) (5 diffs)
• SoundSystem/Common/MP3Stream.cpp (modified) (2 diffs)
• SoundSystem/Common/OggVorbisStream.cpp (modified) (1 diff)
• SoundSystem/SoundSysOpenAL/BufferManager.cpp (modified) (1 diff)
• SoundSystem/SoundSysOpenAL/SoundSysImpl.cpp (modified) (2 diffs)

cafu/trunk/Libs/SConscript

@@ -112 +112 @@
 
 
+LibPath="#/ExtLibs/Cg/lib"
 if sys.platform=="win32":
     LibList=Split("cfsLib cfs_png cfs_jpeg z MatSys opengl32.lib glu32.lib cg cgGL")
+    if envRenderers["TARGET_ARCH"]!="x86": LibPath += ".x64"
 elif sys.platform=="linux2":
     LibList=Split("Cg CgGL")
@@ -131 +133 @@
                MatSys_CommonObjectsList,
         CPPPATH=env['CPPPATH']+["#/ExtLibs/Cg/include"],
-        LIBPATH=env['LIBPATH']+["#/ExtLibs/Cg/lib"],
+        LIBPATH=env['LIBPATH']+[LibPath],
         LIBS=LibList)
 
 
 
+LibPath="#/ExtLibs/Cg/lib"
 if sys.platform=="win32":
     LibList=Split("cfsLib cfs_png cfs_jpeg z MatSys opengl32.lib glu32.lib cg cgGL")
+    if envRenderers["TARGET_ARCH"]!="x86": LibPath += ".x64"
 elif sys.platform=="linux2":
     LibList=Split("Cg CgGL")
@@ -155 +159 @@
                MatSys_CommonObjectsList,
         CPPPATH=env['CPPPATH']+["#/ExtLibs/Cg/include"],
-        LIBPATH=env['LIBPATH']+["#/ExtLibs/Cg/lib"],
+        LIBPATH=env['LIBPATH']+[LibPath],
         LIBS=LibList)
 
@@ -212 +216 @@
     envSoundSys.Append(LIBS=["SoundSys", "fmod-3.75"])
 
-if sys.platform!="linux2" or platform.machine()!="x86_64":      # We don't have the FMod libraries for x86_64 platforms...
+# We have the FMod libraries only for 32-bit platforms...
+if (sys.platform=="win32" and envSoundSys["TARGET_ARCH"]=="x86") or (sys.platform=="linux2" and platform.machine()!="x86_64"):
     envSoundSys.SharedLibrary(
         target="SoundSystem/SoundSysFMOD3",
@@ -226 +231 @@
 if sys.platform=="win32":
     envSoundSys.Append(CPPPATH=['#/ExtLibs/openal-win/include'])
-    envSoundSys.Append(LIBPATH=['#/ExtLibs/openal-win/libs/Win32'])
     envSoundSys.Append(LIBS=Split("cfsLib SoundSys OpenAL32 alut mpg123 ogg vorbis vorbisfile"))
+    if envSoundSys["TARGET_ARCH"]=="x86":
+        envSoundSys.Append(LIBPATH=['#/ExtLibs/openal-win/libs/Win32'])
+    else:
+        envSoundSys.Append(LIBPATH=['#/ExtLibs/openal-win/libs/Win64'])
 elif sys.platform=="linux2":
     envSoundSys.Append(CPPPATH=['#/ExtLibs/openal-soft/include'])

cafu/trunk/Libs/SoundSystem/Common/MP3Stream.cpp

@@ -47 +47 @@
     cf::FileSys::InFileI* StreamFile=OpenFiles[FileDesc];
 
-    return StreamFile->Read((char*)Buffer, Count);
+    return StreamFile->Read((char*)Buffer, uint32_t(Count));
 }
 
@@ -199 +199 @@
     }
 
-    return ReadBytes;
+    return int(ReadBytes);
 }
 

cafu/trunk/Libs/SoundSystem/Common/OggVorbisStream.cpp

@@ -39 +39 @@
     cf::FileSys::InFileI* StreamFile=(cf::FileSys::InFileI*) DataSource;
 
-    return StreamFile->Read((char*)Buffer, ElementSize*NumRead);
+    return StreamFile->Read((char*)Buffer, uint32_t(ElementSize*NumRead));
 }
 

cafu/trunk/Libs/SoundSystem/SoundSysOpenAL/BufferManager.cpp

@@ -64 +64 @@
 
         const char*  DeviceNames=alcGetString(NULL, ALC_CAPTURE_DEVICE_SPECIFIER);
-        unsigned int Offset     =0;
+        size_t       Offset     =0;
         unsigned int DeviceNum  =0;
         std::string  DeviceName ="";

cafu/trunk/Libs/SoundSystem/SoundSysOpenAL/SoundSysImpl.cpp

@@ -74 +74 @@
         const char* DefaultDevice=alcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
 
-        unsigned int Offset=0;
+        size_t       Offset=0;
         unsigned int DeviceNum=1;
 
@@ -112 +112 @@
         const char* DefaultDevice=alcGetString(NULL, ALC_DEFAULT_ALL_DEVICES_SPECIFIER);
 
-        unsigned int Offset=0;
+        size_t       Offset=0;
         unsigned int DeviceNum=1;