X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=SConstruct;h=fd6ba8573f48cefc1939f24941106af3d1cc7ab5;hb=5256cb543a9d35b610df19bd227cde977186aef0;hp=14f7f158d4aa8fa57d12b691ac8c7eed242aef16;hpb=72687d725ac5a53ff71379f72b0eea0b3451b62b;p=anna.git

diff --git a/SConstruct b/SConstruct
index 14f7f15..fd6ba85 100644
--- a/SConstruct
+++ b/SConstruct
@@ -18,8 +18,17 @@ target_opt_bin = os.path.join (opt_bin, "anna")
 release = ARGUMENTS.get ('release', 0)
 
 # Environment
-env = Environment ()
-oracle_includes = os.environ['ORACLE_HOME'] + "/include"
+
+# Using clang, uncomment following:
+env = Environment(CXX = 'clang++')
+env.Append (CCFLAGS = '-DIS_CLANG')
+env.Append (CXXFLAGS = '-Wno-parentheses-equality')
+
+# Using c++, uncomment following:
+#env = Environment ()
+
+#oracle_includes = os.environ["ORACLE_HOME"] + "/include"
+oracle_includes = "/usr/lib/oracle/12.1/client64/include"
         
 # Headers
 source_include = os.path.join (current_directory, "include")
@@ -39,9 +48,9 @@ libraries = []
 #env = Environment ()
 # CPPPATH will be relative to src/<target>
 env.Append (CPPPATH = [source_include, usr_local_include, usr_include ])
-env.Append (CCFLAGS = '-std=c++0x')
+#env.Append (CCFLAGS = '-std=c++0x')
 # C++11 support:
-#env.Append (CXXFLAGS = '-std=c++11')
+env.Append (CXXFLAGS = '-std=c++11')
 
 env.Append (LIBS = [''])
 # scons -Q release=1
@@ -51,7 +60,7 @@ if int(release):
   env.Append (VARIANT = variant)
 else:
   variant='debug'
-  env.Append (CCFLAGS = '-g -O0 -D_DEBUG')
+  env.Append (CCFLAGS = '-g -O0')
   env.Append (LIBPATH = os.path.join (current_directory, variant))
   env.Append (VARIANT = variant)