Unify GL specs.

[apitrace] / SConstruct

diff --git a/SConstruct b/SConstruct
index 57fbf6ffe25c39c644a85bf05f5b857f621d17f0..9adf118bb298a54947a07d6b589dc464ac6171ac 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -27,6 +27,7 @@ import os
 import os.path
 import platform
 import sys
+import time
 
 _platform_map = {
     'freebsd': 'freebsd',
@@ -68,7 +69,7 @@ Help(vars.GenerateHelpText(env))
 
 Export(['env'])
 
-env.Tool(env['toolchain'], toolpath = ['scons'])
+env.Tool(env['toolchain'])
 
 env['gcc'] = 'gcc' in os.path.basename(env['CC']).split('-')
 env['msvc'] = env['CC'] == 'cl'
@@ -186,7 +187,7 @@ env.Prepend(LIBS = [
 
 SConscript('zlib/SConscript')
 
-env.Tool('dxsdk', toolpath = ['scons'])
+env.Tool('dxsdk')
 
 conf = Configure(env)
 has_d3d7 = conf.CheckCXXHeader('ddraw.h')
@@ -214,6 +215,7 @@ if has_d3d7 and False:
             'ddraw.def',
             'ddraw.cpp',
             'log.cpp',
+            'os_win32.cpp',
         ]
     )
 
@@ -232,6 +234,7 @@ if has_d3d8:
             'd3d8.def',
             'd3d8.cpp',
             'log.cpp',
+            'os_win32.cpp',
         ]
     )
 
@@ -250,6 +253,7 @@ if has_d3d9:
             'd3d9.def',
             'd3d9.cpp',
             'log.cpp',
+            'os_win32.cpp',
         ]
     )
 
@@ -268,6 +272,7 @@ if has_d3d10:
             'd3d10.def',
             'd3d10.cpp',
             'log.cpp',
+            'os_win32.cpp',
         ]
     )
 
@@ -286,6 +291,7 @@ if has_d3d10_1:
             'd3d10_1.def',
             'd3d10_1.cpp',
             'log.cpp',
+            'os_win32.cpp',
         ]
     )
 
@@ -303,6 +309,7 @@ opengl32 = env.SharedLibrary(
         'opengl32.def',
         'opengl32.cpp',
         'log.cpp',
+        'os_win32.cpp',
     ]
 )
 
@@ -312,7 +319,7 @@ env.Tool('packaging')
 
 zip = env.Package(
     NAME           = 'apitrace',
-    VERSION        = '0.3',
+    VERSION        = time.strftime('%Y%m%d'),
     PACKAGEVERSION = 0,
     PACKAGETYPE    = 'zip',
     LICENSE        = 'lgpl',
@@ -328,4 +335,4 @@ zip = env.Package(
     ],
 )
 
-env.Alias('zip', zip)
+env.Alias('dist', zip)