1 files changed, 6 insertions, 9 deletions
diff --git a/test/CXX/SHCXXFLAGS.py b/test/CXX/SHCXXFLAGS.py
index 88da443..049835c 100644
--- a/test/CXX/SHCXXFLAGS.py
+++ b/test/CXX/SHCXXFLAGS.py
@@ -29,15 +29,8 @@ import TestSCons
 import os
 import string
 
-if sys.platform == 'win32':
-    _obj = '.obj'
-    fooflags = '/nologo -DFOO'
-    barflags = '/nologo -DBAR'
-else:
-    _obj = '.o'
-    fooflags = '-DFOO'
-    barflags = '-DBAR'
-    
+_obj = TestSCons._obj
+
 if os.name == 'posix':
     os.environ['LD_LIBRARY_PATH'] = '.'
 if string.find(sys.platform, 'irix') > -1:
@@ -45,6 +38,10 @@ if string.find(sys.platform, 'irix') > -1:
 
 test = TestSCons.TestSCons()
 
+e = test.Environment()
+fooflags = e['SHCXXFLAGS'] + ' -DFOO'
+barflags = e['SHCXXFLAGS'] + ' -DBAR'
+
 test.write('SConstruct', """
 foo = Environment(SHCXXFLAGS = '%s', WINDOWS_INSERT_DEF=1)
 bar = Environment(SHCXXFLAGS = '%s', WINDOWS_INSERT_DEF=1)