Show
Ignore:
Timestamp:
08/30/10 11:27:26 (21 months ago)
Author:
Carsten
Message:

Added the new Cg 3 binaries for 32- and 64-bit Linux as well.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • cafu/trunk/Libs/SConscript

    r140 r141  
    118118elif sys.platform=="linux2": 
    119119    LibList=Split("Cg CgGL") 
    120 else: 
    121     LibList=[] 
    122  
    123 if sys.platform!="linux2" or platform.machine()!="x86_64":      # We don't have the NVidia Cg libraries for x86_64 platforms... 
    124     envRenderers.SharedLibrary( 
    125         target="MaterialSystem/RendererCgARB1", 
    126         source=[os.path.join("MaterialSystem/RendererCgARB1", x) for x in Split(""" 
    127                    RendererCgARB1.cpp RendererImpl.cpp RenderMaterial.cpp Shader.cpp TextureMapImpl.cpp 
    128  
    129                    Shaders/A_Terrain.cpp Shaders/A_Diff.cpp Shaders/A_Diff_Luma.cpp Shaders/A_Diff_Norm.cpp Shaders/A_Diff_Norm_Luma.cpp 
    130                    Shaders/A_Diff_Light.cpp Shaders/A_Diff_Light_Luma.cpp Shaders/A_Diff_Light_Norm.cpp Shaders/A_Diff_Light_Norm_Luma.cpp 
    131                    Shaders/A_SkyDome.cpp Shaders/A_Solid.cpp Shaders/A_WaterCubeReflect.cpp Shaders/L_Diff.cpp Shaders/L_Diff_Spec.cpp 
    132                    Shaders/L_Diff_Norm.cpp Shaders/L_Diff_Norm_Spec.cpp Shaders/StencilShadowVolumes.cpp Shaders/_CommonCgHelpers.cpp""")] + 
    133                MatSys_CommonObjectsList, 
    134         CPPPATH=env['CPPPATH']+["#/ExtLibs/Cg/include"], 
    135         LIBPATH=env['LIBPATH']+[LibPath], 
    136         LIBS=LibList) 
     120    if platform.machine()=="x86_64": LibPath += ".x64" 
     121else: 
     122    LibList=[] 
     123 
     124envRenderers.SharedLibrary( 
     125    target="MaterialSystem/RendererCgARB1", 
     126    source=[os.path.join("MaterialSystem/RendererCgARB1", x) for x in Split(""" 
     127               RendererCgARB1.cpp RendererImpl.cpp RenderMaterial.cpp Shader.cpp TextureMapImpl.cpp 
     128 
     129               Shaders/A_Terrain.cpp Shaders/A_Diff.cpp Shaders/A_Diff_Luma.cpp Shaders/A_Diff_Norm.cpp Shaders/A_Diff_Norm_Luma.cpp 
     130               Shaders/A_Diff_Light.cpp Shaders/A_Diff_Light_Luma.cpp Shaders/A_Diff_Light_Norm.cpp Shaders/A_Diff_Light_Norm_Luma.cpp 
     131               Shaders/A_SkyDome.cpp Shaders/A_Solid.cpp Shaders/A_WaterCubeReflect.cpp Shaders/L_Diff.cpp Shaders/L_Diff_Spec.cpp 
     132               Shaders/L_Diff_Norm.cpp Shaders/L_Diff_Norm_Spec.cpp Shaders/StencilShadowVolumes.cpp Shaders/_CommonCgHelpers.cpp""")] + 
     133           MatSys_CommonObjectsList, 
     134    CPPPATH=env['CPPPATH']+["#/ExtLibs/Cg/include"], 
     135    LIBPATH=env['LIBPATH']+[LibPath], 
     136    LIBS=LibList) 
    137137 
    138138 
    … …  
    144144elif sys.platform=="linux2": 
    145145    LibList=Split("Cg CgGL") 
    146 else: 
    147     LibList=[] 
    148  
    149 if sys.platform!="linux2" or platform.machine()!="x86_64":      # We don't have the NVidia Cg libraries for x86_64 platforms... 
    150     envRenderers.SharedLibrary( 
    151         target="MaterialSystem/RendererCgNV2X", 
    152         source=[os.path.join("MaterialSystem/RendererCgNV2X", x) for x in Split(""" 
    153                    RendererCgNV2X.cpp RendererImpl.cpp RenderMaterial.cpp Shader.cpp TextureMapImpl.cpp 
    154  
    155                    Shaders/A_Terrain.cpp Shaders/A_Diff.cpp Shaders/A_Diff_Luma.cpp Shaders/A_Diff_Norm.cpp Shaders/A_Diff_Norm_Luma.cpp 
    156                    Shaders/A_Diff_Light.cpp Shaders/A_Diff_Light_Luma.cpp Shaders/A_Diff_Light_Norm.cpp Shaders/A_Diff_Light_Norm_Luma.cpp 
    157                    Shaders/A_SkyDome.cpp Shaders/A_Solid.cpp Shaders/A_WaterCubeReflect.cpp Shaders/L_Diff.cpp Shaders/L_Diff_Spec.cpp 
    158                    Shaders/L_Diff_Norm_oSpec.cpp Shaders/StencilShadowVolumes.cpp Shaders/_CommonCgHelpers.cpp""")] + 
    159                MatSys_CommonObjectsList, 
    160         CPPPATH=env['CPPPATH']+["#/ExtLibs/Cg/include"], 
    161         LIBPATH=env['LIBPATH']+[LibPath], 
    162         LIBS=LibList) 
     146    if platform.machine()=="x86_64": LibPath += ".x64" 
     147else: 
     148    LibList=[] 
     149 
     150envRenderers.SharedLibrary( 
     151    target="MaterialSystem/RendererCgNV2X", 
     152    source=[os.path.join("MaterialSystem/RendererCgNV2X", x) for x in Split(""" 
     153               RendererCgNV2X.cpp RendererImpl.cpp RenderMaterial.cpp Shader.cpp TextureMapImpl.cpp 
     154 
     155               Shaders/A_Terrain.cpp Shaders/A_Diff.cpp Shaders/A_Diff_Luma.cpp Shaders/A_Diff_Norm.cpp Shaders/A_Diff_Norm_Luma.cpp 
     156               Shaders/A_Diff_Light.cpp Shaders/A_Diff_Light_Luma.cpp Shaders/A_Diff_Light_Norm.cpp Shaders/A_Diff_Light_Norm_Luma.cpp 
     157               Shaders/A_SkyDome.cpp Shaders/A_Solid.cpp Shaders/A_WaterCubeReflect.cpp Shaders/L_Diff.cpp Shaders/L_Diff_Spec.cpp 
     158               Shaders/L_Diff_Norm_oSpec.cpp Shaders/StencilShadowVolumes.cpp Shaders/_CommonCgHelpers.cpp""")] + 
     159           MatSys_CommonObjectsList, 
     160    CPPPATH=env['CPPPATH']+["#/ExtLibs/Cg/include"], 
     161    LIBPATH=env['LIBPATH']+[LibPath], 
     162    LIBS=LibList) 
    163163 
    164164