Set correct macro for static symbols (AcademySoftwareFoundation#77)

* Set correct macro for static symbols

Signed-off-by: BtbN <timo@rothenpieler.org>

* Improve oapv.pc for static linking

LIB_NAME was not defined, variable is named LIB_NAME_BASE.

Signed-off-by: BtbN <timo@rothenpieler.org>

---------

Signed-off-by: BtbN <timo@rothenpieler.org>

Author: BtbN

pkgconfig/oapv.pc.in

@@ -2,14 +2,16 @@
 prefix=@CMAKE_INSTALL_PREFIX@ 
 exec_prefix=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@
 libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
-includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/@LIB_NAME@
+includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/@LIB_NAME_BASE@
 
 Name: oapv
 Description: Advanced Professional Video Codec
 
 Version: @PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@
 
 Requires:
-Libs: -L${libdir} -loapv
+Libs: -L${libdir} -l@LIB_NAME_BASE@
+Libs.private: -L${libdir}/@LIB_NAME_BASE@ -lm
 
 Cflags: -I${includedir}
+Cflags.private: -DOAPV_STATIC_DEFINE

src/CMakeLists.txt

@@ -67,7 +67,7 @@ generate_export_header(${LIB_NAME_BASE}_dynamic
                        EXPORT_FILE_NAME ${CMAKE_BINARY_DIR}/include/oapv/oapv_exports.h)
 
 # This will cause the export macros to expand to nothing when building the static library.
-set_target_properties(${LIB_NAME_BASE} PROPERTIES COMPILE_FLAGS -DLIBSHARED_AND_STATIC_STATIC_DEFINE)
+target_compile_definitions(${LIB_NAME_BASE} PUBLIC OAPV_STATIC_DEFINE)
 
 source_group("base\\header" FILES ${LIB_BASE_INC} ${LIB_INC})
 source_group("base\\source" FILES ${LIB_BASE_SRC} ${LIB_API_SRC})