htsky

commit 698ca1a59dd0cfc31b4bfc185a3cd613abade814
parent a86dcc6891db81321f6ce0cc4f4f9a323d2acd27
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue, 11 Feb 2020 16:42:37 +0100

Fix the export the the Star-MTL program symbols

Diffstat:
M
cmake/CMakeLists.txt
 | 
1
-
M
src/htsky_smtl.c
 | 
2
+-
M
src/htsky_smtl.h
 | 
37
++++++++++++++-----------------------

3 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -18,7 +18,6 @@ project(htsky C)
 enable_testing()
 
 set(HTSKY_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../src)
-option(NO_TEST "Do not build tests" OFF)
 
 ################################################################################
 # Check dependencies
diff --git a/src/htsky_smtl.c b/src/htsky_smtl.c
@@ -294,7 +294,7 @@ smtl_program_cpnt_phasefn_hg_get_g
     (sky, spec->value.kdistrib.iband, spec->value.kdistrib.iquad);
 }
 
-HTSKY_SMTL_API enum smtl_spectral_type
+enum smtl_spectral_type
 smtl_program_cpnt_phasefn_hg_get_g_spectral_type(void* program, const int cpnt_id)
 {
   (void)program, (void)cpnt_id;
diff --git a/src/htsky_smtl.h b/src/htsky_smtl.h
@@ -20,15 +20,6 @@
 #include <star/smtl.h>
 #include <rsys/rsys.h>
 
-/* Library symbol management */
-#if defined(HTSKY_SMTL_SHARED_BUILD) /* Build shared library */
-  #define HTSKY_SMTL_API extern EXPORT_SYM
-#elif defined(HTSKY_SMTL_STATIC) /* Use/build static library */
-  #define HTSKY_SMTL_API extern LOCAL_SYM
-#else /* Use shared library */
-  #define HTSKY_SMTL_API extern IMPORT_SYM
-#endif
-
 /*
  * Usage: htsky [OPTION]... -a ATMOSPHERE
  * Manage the data representing a clear/cloudy sky.
@@ -51,7 +42,7 @@ BEGIN_DECLS
 /*******************************************************************************
  * Common functions
  ******************************************************************************/
-HTSKY_SMTL_API res_T
+HTSKY_API res_T
 smtl_program_init
   (struct logger* logger, /* NULL <=> use default logger */
    struct mem_allocator* allocator, /* NULL <=> use default allocator */
@@ -59,75 +50,75 @@ smtl_program_init
    char* argv[],
    void** out_prog);
 
-HTSKY_SMTL_API void
+HTSKY_API void
 smtl_program_release
   (void* program);
 
 /*******************************************************************************
  * General material attribs
  ******************************************************************************/
-HTSKY_SMTL_API const char*
+HTSKY_API const char*
 smtl_program_get_mtl_name
   (void* program);
 
-HTSKY_SMTL_API enum smtl_mtl_type
+HTSKY_API enum smtl_mtl_type
 smtl_prgram_get_mtl_type
   (void* program);
 
 /*******************************************************************************
  * Component attributes
  ******************************************************************************/
-HTSKY_SMTL_API size_t
+HTSKY_API size_t
 smtl_program_get_cpnts_count
   (void* program);
 
-HTSKY_SMTL_API int
+HTSKY_API int
 smtl_program_find_cpnt
   (void* program,
    const char* cpnt_name);
 
-HTSKY_SMTL_API const char*
+HTSKY_API const char*
 smtl_program_cpnt_get_name
   (void* program,
    const int cpnt_id);
 
-HTSKY_SMTL_API double
+HTSKY_API double
 smtl_program_cpnt_get_ka
   (void* program,
    const int cpnt_id,
    const struct smtl_spectral_data* spec,
    const struct smtl_vertex* vtx);
 
-HTSKY_SMTL_API enum smtl_spectral_type
+HTSKY_API enum smtl_spectral_type
 smtl_program_cpnt_get_ka_spectral_type
   (void* program,
    const int cpnt_id);
 
-HTSKY_SMTL_API double
+HTSKY_API double
 smtl_program_cpnt_get_ks
   (void* program,
    const int cpnt_id,
    const struct smtl_spectral_data* spec,
    const struct smtl_vertex* vtx);
 
-HTSKY_SMTL_API enum smtl_spectral_type
+HTSKY_API enum smtl_spectral_type
 smtl_program_cpnt_get_ks_spectral_type
   (void* program,
    const int cpnt_id);
 
-HTSKY_SMTL_API double
+HTSKY_API double
 smtl_program_cpnt_phasefn_hg_get_g
   (void* program,
    const int cpnt_id,
    const struct smtl_spectral_data* spec,
    const struct smtl_vertex* vtx);
 
-HTSKY_SMTL_API enum smtl_spectral_type
+HTSKY_API enum smtl_spectral_type
 smtl_program_cpnt_phasefn_hg_get_g_spectral_type
   (void* program,
    const int cpnt_id);
 
-HTSKY_SMTL_API enum smtl_phasefn_type
+HTSKY_API enum smtl_phasefn_type
 smtl_program_cpnt_get_phasefn_type
   (void* program,
    const int cpnt_id);