summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--volk/CMakeLists.txt7
-rw-r--r--volk/gen/make_c.py2
-rw-r--r--volk/gen/make_each_machine_c.py2
-rw-r--r--volk/gen/make_machines_c.py2
-rw-r--r--volk/gen/make_makefile_am.py3
-rw-r--r--volk/gen/volk_register.py4
-rw-r--r--volk/include/volk/Makefile.am3
-rw-r--r--volk/include/volk/volk_prefs.h12
-rw-r--r--volk/lib/CMakeLists.txt8
9 files changed, 30 insertions, 13 deletions
diff --git a/volk/CMakeLists.txt b/volk/CMakeLists.txt
index 320efa7b4..f333d939b 100644
--- a/volk/CMakeLists.txt
+++ b/volk/CMakeLists.txt
@@ -62,10 +62,15 @@ INSTALL(
########################################################################
INSTALL(
DIRECTORY ${CMAKE_SOURCE_DIR}/include/volk
- DIRECTORY ${CMAKE_BINARY_DIR}/include/volk
DESTINATION include FILES_MATCHING PATTERN "*.h"
)
+INSTALL(FILES
+ ${CMAKE_BINARY_DIR}/include/volk/volk.h
+ ${CMAKE_BINARY_DIR}/include/volk/volk_cpu.h
+ ${CMAKE_BINARY_DIR}/include/volk/volk_config_fixed.h
+DESTINATION include/volk)
+
########################################################################
# Setup the library
########################################################################
diff --git a/volk/gen/make_c.py b/volk/gen/make_c.py
index fa08bbb0e..e946152d0 100644
--- a/volk/gen/make_c.py
+++ b/volk/gen/make_c.py
@@ -28,7 +28,7 @@ def make_c(machines, archs, functions, arched_arglist, my_arglist):
"""
tempstring += """
#include <volk/volk_common.h>
-#include <volk/volk_machines.h>
+#include "volk_machines.h"
#include <volk/volk_typedefs.h>
#include <volk/volk_cpu.h>
#include "volk_rank_archs.h"
diff --git a/volk/gen/make_each_machine_c.py b/volk/gen/make_each_machine_c.py
index dfb7011b4..d4f5f01de 100644
--- a/volk/gen/make_each_machine_c.py
+++ b/volk/gen/make_each_machine_c.py
@@ -62,7 +62,7 @@ def make_each_machine_c(machine_name, archs, functions, fcountlist, taglist):
tempstring += """
#include <volk/volk_common.h>
-#include <volk/volk_machines.h>
+#include "volk_machines.h"
#include <volk/volk_config_fixed.h>
"""
diff --git a/volk/gen/make_machines_c.py b/volk/gen/make_machines_c.py
index ccac21131..a7ab63d6e 100644
--- a/volk/gen/make_machines_c.py
+++ b/volk/gen/make_machines_c.py
@@ -24,7 +24,7 @@ def make_machines_c(machines):
#include <volk/volk_common.h>
#include <volk/volk_typedefs.h>
-#include <volk/volk_machines.h>
+#include "volk_machines.h"
struct volk_machine *volk_machines[] = {
"""
diff --git a/volk/gen/make_makefile_am.py b/volk/gen/make_makefile_am.py
index ff9749e17..d700626bb 100644
--- a/volk/gen/make_makefile_am.py
+++ b/volk/gen/make_makefile_am.py
@@ -47,6 +47,7 @@ libvolk_la_SOURCES = \
$(top_gendir)/lib/volk.c \
$(top_gendir)/lib/volk_cpu.c \
volk_rank_archs.c \
+ volk_prefs.c \
$(top_gendir)/lib/volk_machines.c
if LV_HAVE_ORC
@@ -101,6 +102,8 @@ noinst_LTLIBRARIES =
# ----------------------------------------------------------------
noinst_HEADERS = \
$(top_gendir)/lib/volk_init.h \
+ $(top_gendir)/lib/volk_machines.h \
+ $(top_gendir)/lib/volk_environment_init.h \
qa_utils.h
# ----------------------------------------------------------------
diff --git a/volk/gen/volk_register.py b/volk/gen/volk_register.py
index dba364e01..62ebba3c2 100644
--- a/volk/gen/volk_register.py
+++ b/volk/gen/volk_register.py
@@ -44,9 +44,9 @@ outfile_cpu_c = open(os.path.join(gendir, "lib/volk_cpu.c"), "w")
#outfile_config_in = open(os.path.join(gendir, "include/volk/volk_config.h.in"), "w")
outfile_config_fixed = open(os.path.join(gendir, "include/volk/volk_config_fixed.h"), "w")
outfile_environment_c = open(os.path.join(gendir, "lib/volk_environment_init.c"), "w")
-outfile_environment_h = open(os.path.join(gendir, "include/volk/volk_environment_init.h"), "w")
+outfile_environment_h = open(os.path.join(gendir, "lib/volk_environment_init.h"), "w")
outfile_makefile_am = open(os.path.join(gendir, "lib/Makefile.am"), "w")
-outfile_machines_h = open(os.path.join(gendir, "include/volk/volk_machines.h"), "w")
+outfile_machines_h = open(os.path.join(gendir, "lib/volk_machines.h"), "w")
outfile_machines_c = open(os.path.join(gendir, "lib/volk_machines.c"), "w")
infile = open(os.path.join(srcdir, "include/volk/Makefile.am"), "r")
diff --git a/volk/include/volk/Makefile.am b/volk/include/volk/Makefile.am
index a05f0fbfd..5f9e134bc 100644
--- a/volk/include/volk/Makefile.am
+++ b/volk/include/volk/Makefile.am
@@ -28,12 +28,11 @@ volkincludedir = $(prefix)/include/volk
volkinclude_HEADERS = \
volk_complex.h \
volk_common.h \
+ volk_prefs.h \
$(top_gendir)/include/volk/volk_config_fixed.h \
$(top_gendir)/include/volk/volk_typedefs.h \
$(top_gendir)/include/volk/volk.h \
$(top_gendir)/include/volk/volk_cpu.h \
- $(top_gendir)/include/volk/volk_machines.h \
- $(top_gendir)/include/volk/volk_environment_init.h \
volk_16i_x5_add_quad_16i_x4_a16.h \
volk_16i_branch_4_state_8_a16.h \
volk_16ic_deinterleave_16i_x2_a16.h \
diff --git a/volk/include/volk/volk_prefs.h b/volk/include/volk/volk_prefs.h
index 77bcb709b..2a7f7e79f 100644
--- a/volk/include/volk/volk_prefs.h
+++ b/volk/include/volk/volk_prefs.h
@@ -1,7 +1,11 @@
#ifndef INCLUDED_VOLK_PREFS_H
#define INCLUDED_VOLK_PREFS_H
-struct volk_arch_pref {
+#include <volk/volk_common.h>
+
+__VOLK_DECL_BEGIN
+
+struct VOLK_API volk_arch_pref {
char name[128];
char arch[32];
};
@@ -9,11 +13,13 @@ struct volk_arch_pref {
////////////////////////////////////////////////////////////////////////
// get path to volk_config profiling info
////////////////////////////////////////////////////////////////////////
-void get_config_path(char *);
+VOLK_API void get_config_path(char *);
////////////////////////////////////////////////////////////////////////
// load prefs into global prefs struct
////////////////////////////////////////////////////////////////////////
-int load_preferences(struct volk_arch_pref **);
+VOLK_API int load_preferences(struct volk_arch_pref **);
+
+__VOLK_DECL_END
#endif //INCLUDED_VOLK_PREFS_H
diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt
index f3ee2ab3d..5dd41be0f 100644
--- a/volk/lib/CMakeLists.txt
+++ b/volk/lib/CMakeLists.txt
@@ -135,8 +135,8 @@ SET(volk_gen_sources
${CMAKE_BINARY_DIR}/lib/volk_cpu.c
${CMAKE_BINARY_DIR}/include/volk/volk_config_fixed.h
${CMAKE_BINARY_DIR}/lib/volk_environment_init.c
- ${CMAKE_BINARY_DIR}/include/volk/volk_environment_init.h
- ${CMAKE_BINARY_DIR}/include/volk/volk_machines.h
+ ${CMAKE_BINARY_DIR}/lib/volk_environment_init.h
+ ${CMAKE_BINARY_DIR}/lib/volk_machines.h
${CMAKE_BINARY_DIR}/lib/volk_machines.c
${machine_sources}
)
@@ -193,6 +193,10 @@ ENDIF()
########################################################################
# Setup the volk sources list and library
########################################################################
+IF(NOT WIN32)
+ ADD_DEFINITIONS(-fvisibility=hidden)
+ENDIF()
+
INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/include
${CMAKE_BINARY_DIR}/include
generated by cgit (git 2.34.1) at 2025-01-10 01:17:14 +0000