Update env for DXF

diff --git a/products/env_scripts/DXF.py b/products/env_scripts/DXF.py
old mode 100644 (file)
new mode 100755 (executable)
index 2c18481..567ab81
--- a/products/env_scripts/DXF.py
+++ b/products/env_scripts/DXF.py
@@ -1,15 +1,22 @@
-#!/usr/bin/env python
-#-*- coding:utf-8 -*-
-
-import os.path
-import platform
-
-def set_env(env, prereq_dir, version):
-    env.set('DXF_ROOT_DIR', prereq_dir)
-    env.set('DXF_DIR', prereq_dir)
-    env.prepend('PYTHONPATH', env.get('DXF_DIR'))
-    env.prepend('PYTHONPATH', env.get('DXF_ROOT_DIR'))
-    
-def set_nativ_env(env):
-    env.set('DXF_ROOT_DIR', '/usr')    # update for cmake
-    env.set('DXF_DIR', '/usr')
+#!/usr/bin/env python\r
+#-*- coding:utf-8 -*-\r
+\r
+import os.path\r
+import platform\r
+\r
+def set_env(env, prereq_dir, version):\r
+    env.set('DXF_ROOT_DIR', prereq_dir)\r
+    env.set('DXF_DIR', prereq_dir)\r
+    env.set('PRODUCTS_DXF_LIBRARIES', os.path.join(prereq_dir, 'lib'))\r
+    env.prepend('PYTHONPATH', env.get('DXF_DIR'))\r
+    env.prepend('PYTHONPATH', env.get('DXF_ROOT_DIR'))\r
+    \r
+    if platform.system()=="Windows" :\r
+        env.prepend('PATH', os.path.join(prereq_dir, 'win64', 'vc14' ,'bin'))\r
+    else :\r
+        env.prepend('PATH', os.path.join(prereq_dir, 'bin'))\r
+        env.prepend('LD_LIBRARY_PATH', os.path.join(prereq_dir, 'lib'))\r
+\r
+def set_nativ_env(env):\r
+    env.set('DXF_ROOT_DIR', '/usr')    # update for cmake\r
+    env.set('DXF_DIR', '/usr')\r