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() 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 diff --git a/Web/coolprop/contents.rst b/Web/coolprop/contents.rst index 6ac932d6..2c541fec 100644 --- a/Web/coolprop/contents.rst +++ b/Web/coolprop/contents.rst @@ -10,4 +10,4 @@ This section includes information about the CoolProp software, listings of input wrappers/wrappers.rst HighLevelAPI.rst LowLevelAPI.rst - changelog.rst \ No newline at end of file + changelog.rst diff --git a/Web/coolprop/wrappers/wrappers.rst b/Web/coolprop/wrappers/wrappers.rst index 5a728f86..35e2ec10 100644 --- a/Web/coolprop/wrappers/wrappers.rst +++ b/Web/coolprop/wrappers/wrappers.rst @@ -8,25 +8,23 @@ 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 -======================= =========================== ======================================= -: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 -Mathematica -FORTRAN linux, OSX, win -:ref:`EES ` windows only -Microsoft Excel windows only -======================= =========================== ======================================= +======================================= =========================== ======================================= +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 +: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 +======================================= =========================== ======================================= .. _wrapper_common_prereqs: