Don't link to libdl when building with NO_DYNAMIC_VP defined
Unified · Split
| @@ -1,5 +1,5 @@ | |||
| 1 | USE_ASM = No # We don't have ASM working on Mac yet | 1 | USE_ASM = No # We don't have ASM working on Mac yet |
| 2 | ASM = nasm | 2 | ASM = nasm |
| 3 | CFLAGS += -fPIC | 3 | CFLAGS += -fPIC |
| 4 | LDFLAGS += -ldl -lpthread | 4 | LDFLAGS += -lpthread |
| 5 | ASMFLAGS += -f macho --prefix _ | 5 | ASMFLAGS += -f macho --prefix _ |
| @@ -1,5 +1,5 @@ | |||
| 1 | ASM = nasm | 1 | ASM = nasm |
| 2 | CFLAGS += -fPIC -DLINUX -D__NO_CTYPE | 2 | CFLAGS += -fPIC -DLINUX -D__NO_CTYPE |
| 3 | LDFLAGS += -ldl -lpthread | 3 | LDFLAGS += -lpthread |
| 4 | ASMFLAGS += -f elf | 4 | ASMFLAGS += -f elf |
| 5 | 5 | ||
| @@ -293,6 +293,7 @@ int32_t CWelsCodecTrace::LoadWelsTraceModule() { · 292 unmodified lines | |||
| 293 | } | 293 | } |
| 294 | 294 | ||
| 295 | int32_t CWelsCodecTrace::UnloadWelsTraceModule() { | 295 | int32_t CWelsCodecTrace::UnloadWelsTraceModule() { |
| 296 | #ifndef NO_DYNAMIC_VP | ||
| 296 | #if defined _WIN32 | 297 | #if defined _WIN32 |
| 297 | if (m_hTraceHandle) { | 298 | if (m_hTraceHandle) { |
| 298 | ::FreeLibrary ((HMODULE)m_hTraceHandle); | 299 | ::FreeLibrary ((HMODULE)m_hTraceHandle); |
| @@ -305,6 +306,7 @@ int32_t CWelsCodecTrace::UnloadWelsTraceModule() { · 6 unmodified lines | |||
| 305 | if (m_hTraceHandle) { | 306 | if (m_hTraceHandle) { |
| 306 | ::dlclose (m_hTraceHandle); | 307 | ::dlclose (m_hTraceHandle); |
| 307 | } | 308 | } |
| 309 | #endif | ||
| 308 | #endif | 310 | #endif |
| 309 | 311 | ||
| 310 | m_hTraceHandle = NULL; | 312 | m_hTraceHandle = NULL; |