Changeset 138 for cafu/trunk/SConscript

Show
Ignore:
Timestamp:
08/27/10 18:55:42 (21 months ago)
Author:
Carsten
Message:

Code enhancements for the native 64-bit Windows (LLP64) port.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • cafu/trunk/SConscript

    r137 r138  
    5757                       + Split("GL GLU")) 
    5858 
    59 envTools.Program('CaSanity', ['CaTools/CaSanity.cpp'] + CommonWorldObject) 
    60  
    6159envTools.Program("MakeFont", "CaTools/MakeFont.cpp", LIBS=envTools["LIBS"]+["freetype"]) 
    6260 
    63 envTools.Program('MaterialViewer', "CaTools/MaterialViewer.cpp") 
    64  
    65 envTools.Program('ModelViewer', "CaTools/ModelViewer.cpp") 
    66  
    67 envTools.Program('TerrainViewer', "CaTools/TerrainViewer.cpp", CPPPATH=envTools["CPPPATH"]+["ExtLibs/zlib"]) 
    68  
    69 envTools.Program('TerrainViewerOld', "CaTools/TerrainViewerOld.cpp") 
     61if sys.platform!="win32" or envTools["TARGET_ARCH"]=="x86": 
     62    # Don't build these programs under 64-bit Windows, as they still depend on our legacy 32-bit-only DirectInput code. 
     63    envTools.Program('CaSanity', ['CaTools/CaSanity.cpp'] + CommonWorldObject) 
     64    envTools.Program('MaterialViewer', "CaTools/MaterialViewer.cpp") 
     65    envTools.Program('ModelViewer', "CaTools/ModelViewer.cpp") 
     66    envTools.Program('TerrainViewer', "CaTools/TerrainViewer.cpp", CPPPATH=envTools["CPPPATH"]+["ExtLibs/zlib"]) 
     67    envTools.Program('TerrainViewerOld', "CaTools/TerrainViewerOld.cpp") 
    7068 
    7169if sys.platform=="win32":