TR1: move TR1 check to config.h / buildsystem

[lyx.git] / development / scons / SConstruct

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 634ed1810210ab7860ab19dcf5f326716a98047c..c4135706ec9a6105d995dac92d2ccdfbf1d5d6aa 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -411,6 +411,7 @@ if platform_name == 'win32':
 # hard-coded options are required and will always be there
 # default options can be replaced by enviromental variables or command line options
 CCFLAGS_required = []
+CXXFLAGS_required = []
 LINKFLAGS_required = []
 CCFLAGS_default = []
 
@@ -420,6 +421,7 @@ if use_vc:
     #   in the current code page (number)
     # C4996: foo was decleared deprecated
     CCFLAGS_required.append('/EHsc')
+    CXXFLAGS_required.append('/Zc:wchar_t-')
     if mode == 'debug':
         CCFLAGS_default.extend(['/wd4819', '/wd4996', '/nologo', '/MDd'])
     else:
@@ -514,7 +516,7 @@ setEnvVariable(env, 'CPP')
 setEnvVariable(env, 'CXX')
 setEnvVariable(env, 'CXXCPP')
 setEnvVariable(env, 'CCFLAGS', CCFLAGS_required, CCFLAGS_default)
-setEnvVariable(env, 'CXXFLAGS')
+setEnvVariable(env, 'CXXFLAGS', CXXFLAGS_required)
 setEnvVariable(env, 'CPPFLAGS')
 setEnvVariable(env, 'LINKFLAGS', LINKFLAGS_required)
 
@@ -740,7 +742,6 @@ utils.createConfigFile(conf,
         ('ostream', 'HAVE_OSTREAM', 'cxx'),
         ('locale', 'HAVE_LOCALE', 'cxx'),
         ('sstream', 'HAVE_SSTREAM', 'cxx'),
-        #('newapis.h', 'HAVE_NEWAPIS_H', 'c'),
     ],
     custom_tests = [
         (env.has_key('assertions') and env['assertions'] and mode == 'debug',
@@ -775,10 +776,6 @@ utils.createConfigFile(conf,
 
 #define BOOST_ALL_NO_LIB 1
 
-#if defined(HAVE_NEWAPIS_H)
-#  define WANT_GETFILEATTRIBUTESEX_WRAPPER 1
-#endif
-
 /*
  * the FreeBSD libc uses UCS4, but libstdc++ has no proper wchar_t
  * support compiled in:
@@ -1929,6 +1926,7 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS:
             ('lyx2lyx', lib_lyx2lyx_files),
             ('scripts', lib_scripts_files),
             ('templates', lib_templates_files),
+            ('templates/thesis', lib_templates_thesis_files),
             ('tex', lib_tex_files),
             ('ui', lib_ui_files)]:
         dirs.append(env.Install(os.path.join(share_dest_dir, dir),