Show
Ignore:
Timestamp:
08/29/10 23:29:03 (21 months ago)
Author:
Carsten
Message:

More 64-bit Windows build fixes.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • cafu/trunk/Libs/SConscript

    r136 r140  
    112112 
    113113 
     114LibPath="#/ExtLibs/Cg/lib" 
    114115if sys.platform=="win32": 
    115116    LibList=Split("cfsLib cfs_png cfs_jpeg z MatSys opengl32.lib glu32.lib cg cgGL") 
     117    if envRenderers["TARGET_ARCH"]!="x86": LibPath += ".x64" 
    116118elif sys.platform=="linux2": 
    117119    LibList=Split("Cg CgGL") 
    … …  
    131133               MatSys_CommonObjectsList, 
    132134        CPPPATH=env['CPPPATH']+["#/ExtLibs/Cg/include"], 
    133         LIBPATH=env['LIBPATH']+["#/ExtLibs/Cg/lib"], 
     135        LIBPATH=env['LIBPATH']+[LibPath], 
    134136        LIBS=LibList) 
    135137 
    136138 
    137139 
     140LibPath="#/ExtLibs/Cg/lib" 
    138141if sys.platform=="win32": 
    139142    LibList=Split("cfsLib cfs_png cfs_jpeg z MatSys opengl32.lib glu32.lib cg cgGL") 
     143    if envRenderers["TARGET_ARCH"]!="x86": LibPath += ".x64" 
    140144elif sys.platform=="linux2": 
    141145    LibList=Split("Cg CgGL") 
    … …  
    155159               MatSys_CommonObjectsList, 
    156160        CPPPATH=env['CPPPATH']+["#/ExtLibs/Cg/include"], 
    157         LIBPATH=env['LIBPATH']+["#/ExtLibs/Cg/lib"], 
     161        LIBPATH=env['LIBPATH']+[LibPath], 
    158162        LIBS=LibList) 
    159163 
    … …  
    212216    envSoundSys.Append(LIBS=["SoundSys", "fmod-3.75"]) 
    213217 
    214 if sys.platform!="linux2" or platform.machine()!="x86_64":      # We don't have the FMod libraries for x86_64 platforms... 
     218# We have the FMod libraries only for 32-bit platforms... 
     219if (sys.platform=="win32" and envSoundSys["TARGET_ARCH"]=="x86") or (sys.platform=="linux2" and platform.machine()!="x86_64"): 
    215220    envSoundSys.SharedLibrary( 
    216221        target="SoundSystem/SoundSysFMOD3", 
    … …  
    226231if sys.platform=="win32": 
    227232    envSoundSys.Append(CPPPATH=['#/ExtLibs/openal-win/include']) 
    228     envSoundSys.Append(LIBPATH=['#/ExtLibs/openal-win/libs/Win32']) 
    229233    envSoundSys.Append(LIBS=Split("cfsLib SoundSys OpenAL32 alut mpg123 ogg vorbis vorbisfile")) 
     234    if envSoundSys["TARGET_ARCH"]=="x86": 
     235        envSoundSys.Append(LIBPATH=['#/ExtLibs/openal-win/libs/Win32']) 
     236    else: 
     237        envSoundSys.Append(LIBPATH=['#/ExtLibs/openal-win/libs/Win64']) 
    230238elif sys.platform=="linux2": 
    231239    envSoundSys.Append(CPPPATH=['#/ExtLibs/openal-soft/include'])