ref: 1ca805cd855cb57d3dfc1604544eacfac9702728
parent: f427fc63df3f5dc84e10cd2686af3293812b677c
parent: f1cfd1e28a4a894c6fc689e1924f3f8d59af54e8
author: Andreas Gal <[email protected]>
date: Mon Dec 16 01:20:38 EST 2013
Merge pull request #55 from mstorsjo/no-libdl Don't link to libdl when building with NO_DYNAMIC_VP defined
--- a/build/platform-darwin.mk
+++ b/build/platform-darwin.mk
@@ -1,5 +1,5 @@
USE_ASM = No # We don't have ASM working on Mac yet
ASM = nasm
CFLAGS += -fPIC
-LDFLAGS += -ldl -lpthread
+LDFLAGS += -lpthread
ASMFLAGS += -f macho --prefix _
--- a/build/platform-linux.mk
+++ b/build/platform-linux.mk
@@ -1,5 +1,5 @@
ASM = nasm
CFLAGS += -fPIC -DLINUX -D__NO_CTYPE
-LDFLAGS += -ldl -lpthread
+LDFLAGS += -lpthread
ASMFLAGS += -f elf
--- a/codec/decoder/plus/src/welsCodecTrace.cpp
+++ b/codec/decoder/plus/src/welsCodecTrace.cpp
@@ -293,6 +293,7 @@
}
int32_t CWelsCodecTrace::UnloadWelsTraceModule() {+#ifndef NO_DYNAMIC_VP
#if defined _WIN32
if (m_hTraceHandle) {::FreeLibrary ((HMODULE)m_hTraceHandle);
@@ -305,6 +306,7 @@
if (m_hTraceHandle) {::dlclose (m_hTraceHandle);
}
+#endif
#endif
m_hTraceHandle = NULL;