Merge pull request #55 from mstorsjo/no-libdl

Don't link to libdl when building with NO_DYNAMIC_VP defined

Andreas Gal committed 12 years ago

Commit 1ca805c2 parents f427fc6 f1cfd1e3 files · +4 −2Browse files

Unified · Split

3 files

build/platform-darwin.mk +1 −1
build/platform-linux.mk +1 −1
codec/decoder/plus/src/welsCodecTrace.cpp +2 −0

build/platform-darwin.mk+1−1

@@ -1,5 +1,5 @@
1	1	USE_ASM = No # We don't have ASM working on Mac yet
2	2	ASM = nasm
3	3	CFLAGS += -fPIC
4		−LDFLAGS += -ldl -lpthread
	4	+LDFLAGS += -lpthread
5	5	ASMFLAGS += -f macho --prefix _

build/platform-linux.mk+1−1

@@ -1,5 +1,5 @@
1	1	ASM = nasm
2	2	CFLAGS += -fPIC -DLINUX -D__NO_CTYPE
3		−LDFLAGS += -ldl -lpthread
	3	+LDFLAGS += -lpthread
4	4	ASMFLAGS += -f elf
5	5

codec/decoder/plus/src/welsCodecTrace.cpp+2−0

@@ -293,6 +293,7 @@ int32_t CWelsCodecTrace::LoadWelsTraceModule() { · 292 unmodified lines
293	293	}
294	294
295	295	int32_t CWelsCodecTrace::UnloadWelsTraceModule() {
	296	+#ifndef NO_DYNAMIC_VP
296	297	#if defined _WIN32
297	298	if (m_hTraceHandle) {
298	299	::FreeLibrary ((HMODULE)m_hTraceHandle);
@@ -305,6 +306,7 @@ int32_t CWelsCodecTrace::UnloadWelsTraceModule() { · 6 unmodified lines
305	306	if (m_hTraceHandle) {
306	307	::dlclose (m_hTraceHandle);
307	308	}
	309	+#endif
308	310	#endif
309	311
310	312	m_hTraceHandle = NULL;