README and minor environment changes

diff --git a/README b/README
new file mode 100644 (file)
index 0000000..650d1a1
--- /dev/null
+++ b/README
@@ -0,0 +1,31 @@
+NewGEOM version 0.1 (end of development phase 1 result).
+
+
+Compilation on LINUX:
+=====================
+
+  cd <sources_directory>
+  source linux_env.sh 
+  cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=${ROOT_DIR}/install ${ROOT_DIR}/sources
+  make
+  make install
+
+It will create a "build" and "install" folders. Environment is ready to launch an application:
+
+  XGUI
+
+Or without environment call:
+
+  linux_run.sh 
+
+
+Compilation on Windows:
+=======================
+  cd <sources_directory>
+  buildNewGEOM_rel.bat
+
+It will launch the Visual Studio 2010. In it build for: "ALL_BUILD" and then "INSTALL" projects.
+Launch:
+
+  winRun.bat
+  
\ No newline at end of file

diff --git a/linux_env.sh b/linux_env.sh
index b529b4031a8e13f3ca2761573e083cd3f0e4b325..8bd77be37c92c8dcf63a7e4731011d3a0a04bdfc 100644 (file)
--- a/linux_env.sh
+++ b/linux_env.sh
@@ -87,6 +87,7 @@ export CASROOT=${CAS_ROOT_DIR}
 ##
 export LIB=${LD_LIBRARY_PATH}
 
+#------ NewGEOM ------
 export INST_DIR=${ROOT_DIR}/install
 export PATH=${INST_DIR}/bin:${INST_DIR}/plugins:${PATH}
 export LD_LIBRARY_PATH=${INST_DIR}/bin:${INST_DIR}/swig:${INST_DIR}/plugins:${PATH}${LD_LIBRARY_PATH}

diff --git a/msvc10_env.bat b/msvc10_env.bat
index a21fa9f5e40bb056fef2ee960845752971c42d58..ac0173ad4150e08ad1089b103ba366cbe1a7195f 100644 (file)
--- a/msvc10_env.bat
+++ b/msvc10_env.bat
@@ -34,7 +34,6 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 @REM CASCADE
 @SET PATH=%CASROOT%;%CASROOT%\win32\bin%OCC_LIB_PREFIX%;%PATH%
 @SET LIB=%CASROOT%\win32\lib%OCC_LIB_PREFIX%;%LIB%
-@set CSF_GraphicShr=%CASROOT%\win32\bin%OCC_LIB_PREFIX%\TKOpenGl.dll
 @set CSF_MDTVFontDirectory=%CASROOT%\src\FontMFT
 @set CSF_LANGUAGE=us
 @set MMGT_CLEAR=1

diff --git a/winRun.bat b/winRun.bat
new file mode 100644 (file)
index 0000000..5c6182e
--- /dev/null
+++ b/winRun.bat
@@ -0,0 +1,15 @@
+@ECHO OFF
+
+REM Find absolute path to ROOT_DIR 
+@SET PARENT_DIR=%~dp0..
+@SET ROOT_DIR=
+pushd %PARENT_DIR%
+@SET ROOT_DIR=%CD%
+popd
+
+@SET SRC_DIR=%ROOT_DIR%\sources
+@SET OCC_LIB_PREFIX=d
+
+call %SRC_DIR%\msvc10_env.bat
+
+start %ROOT_DIR%\install\bin\XGUI.exe