From 00fe45289ae7fec3ae0d8315f1176f02570930fa Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Fri, 8 Aug 2014 20:12:53 +0200 Subject: [PATCH 1/6] static libraries now build on gcc --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dc131e69..06cd8030 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,7 +147,6 @@ if (COOLPROP_STATIC_LIBRARY) list(APPEND APP_SOURCES "${CMAKE_SOURCE_DIR}/src/CoolPropLib.cpp") add_library(${app_name} STATIC ${APP_SOURCES}) add_dependencies (${app_name} generate_headers) - set_target_properties (${app_name} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -DCOOLPROP_LIB -DCONVENTION=__cdecl") install (TARGETS ${app_name} DESTINATION static_library/${CMAKE_SYSTEM_NAME}) endif() From eaca3522f4e0ad7ae7338d114f06812c7381e43d Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Fri, 8 Aug 2014 20:20:36 +0200 Subject: [PATCH 2/6] Update contents.rst --- Web/coolprop/contents.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Web/coolprop/contents.rst b/Web/coolprop/contents.rst index 6ac932d6..ffde217e 100644 --- a/Web/coolprop/contents.rst +++ b/Web/coolprop/contents.rst @@ -7,7 +7,8 @@ This section includes information about the CoolProp software, listings of input .. toctree:: :maxdepth: 3 + online/index.rst wrappers/wrappers.rst HighLevelAPI.rst LowLevelAPI.rst - changelog.rst \ No newline at end of file + changelog.rst From 42be6233bed59c09d8da7372c4faa6f4b82d12c9 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Fri, 8 Aug 2014 21:09:36 +0200 Subject: [PATCH 3/6] Update wrappers.rst --- Web/coolprop/wrappers/wrappers.rst | 32 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Web/coolprop/wrappers/wrappers.rst b/Web/coolprop/wrappers/wrappers.rst index 5a728f86..d0ca4b91 100644 --- a/Web/coolprop/wrappers/wrappers.rst +++ b/Web/coolprop/wrappers/wrappers.rst @@ -10,23 +10,23 @@ Downloads and instructions for each wrapper are included in the page for the wra Superpacks are available at XXXXXXX which include all the code for a given operating system. -======================= =========================== ======================================= -Language Operating Systems Notes -======================= =========================== ======================================= -:ref:`Python ` linux, OSX, win Wrapper is Cython based -:ref:`Octave ` linux, OSX, win Wrapper is SWIG based -:ref:`C# ` linux, OSX, win Wrapper is SWIG based -:ref:`MATLAB ` linux, OSX, win Wrapper is SWIG based (VERY experimental) -:ref:`Java ` linux, OSX, win Wrapper is SWIG based -Scilab linux, OSX, win Wrapper is SWIG based (experimental) -Modelica linux, OSX, win -Javascript linux, OSX, win Also works in all internet browsers -Maple +======================================= =========================== ======================================= +Language Operating Systems Notes +======================================= =========================== ======================================= +:ref:`Python ` linux, OSX, win Wrapper is Cython based +:ref:`Octave ` linux, OSX, win Wrapper is SWIG based +:ref:`C# ` linux, OSX, win Wrapper is SWIG based +:ref:`MATLAB ` linux, OSX, win Wrapper is SWIG based (VERY experimental) +:ref:`Java ` linux, OSX, win Wrapper is SWIG based +Scilab linux, OSX, win Wrapper is SWIG based (experimental) +Modelica linux, OSX, win +:ref:`Javascript ` linux, OSX, win Also works in all internet browsers +Maple Mathematica -FORTRAN linux, OSX, win -:ref:`EES ` windows only -Microsoft Excel windows only -======================= =========================== ======================================= +FORTRAN linux, OSX, win +:ref:`EES ` windows only +:ref:`Microsoft Excel ` windows only +======================================= =========================== ======================================= .. _wrapper_common_prereqs: From 7cc48070459ac5de8d2ddb074edc5fdc26951c8e Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Sat, 9 Aug 2014 00:08:57 +0200 Subject: [PATCH 4/6] Update wrappers.rst --- Web/coolprop/wrappers/wrappers.rst | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Web/coolprop/wrappers/wrappers.rst b/Web/coolprop/wrappers/wrappers.rst index d0ca4b91..35e2ec10 100644 --- a/Web/coolprop/wrappers/wrappers.rst +++ b/Web/coolprop/wrappers/wrappers.rst @@ -8,8 +8,6 @@ CoolProp at its core is a C++ library, but it can be of interest to use this cod Downloads and instructions for each wrapper are included in the page for the wrapper given in the table below. -Superpacks are available at XXXXXXX which include all the code for a given operating system. - ======================================= =========================== ======================================= Language Operating Systems Notes ======================================= =========================== ======================================= @@ -18,12 +16,12 @@ Language Operating Systems Notes :ref:`C# ` linux, OSX, win Wrapper is SWIG based :ref:`MATLAB ` linux, OSX, win Wrapper is SWIG based (VERY experimental) :ref:`Java ` linux, OSX, win Wrapper is SWIG based -Scilab linux, OSX, win Wrapper is SWIG based (experimental) -Modelica linux, OSX, win -:ref:`Javascript ` linux, OSX, win Also works in all internet browsers -Maple -Mathematica -FORTRAN linux, OSX, win +:ref:`Scilab ` linux, OSX, win Wrapper is SWIG based (experimental) +:ref:`Modelica ` linux, OSX, win +:ref:`Javascript ` cross-platform Also works in all internet browsers +:ref:`Maple ` linux, OSX, win, +:ref:`Mathematica ` +:ref:`FORTRAN ` linux, OSX, win :ref:`EES ` windows only :ref:`Microsoft Excel ` windows only ======================================= =========================== ======================================= From d8445008df1eee6cb32597c0e3f6b10665524ea0 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Sat, 9 Aug 2014 00:09:22 +0200 Subject: [PATCH 5/6] Update contents.rst --- Web/contents.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/Web/contents.rst b/Web/contents.rst index c5cd0141..8b917793 100644 --- a/Web/contents.rst +++ b/Web/contents.rst @@ -10,6 +10,7 @@ CoolProp is an open-source database of fluid and humid air properties, formulate :maxdepth: 2 citation.rst + online/index.rst fluid_properties/contents.rst coolprop/contents.rst apidoc/modules.rst From 5c6db0e9a11c3ba36a12ab4b9fc79af7cf79a9a6 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Sat, 9 Aug 2014 00:09:39 +0200 Subject: [PATCH 6/6] Update contents.rst --- Web/coolprop/contents.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/Web/coolprop/contents.rst b/Web/coolprop/contents.rst index ffde217e..2c541fec 100644 --- a/Web/coolprop/contents.rst +++ b/Web/coolprop/contents.rst @@ -7,7 +7,6 @@ This section includes information about the CoolProp software, listings of input .. toctree:: :maxdepth: 3 - online/index.rst wrappers/wrappers.rst HighLevelAPI.rst LowLevelAPI.rst