diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/module.defs | 5 | ||||
| -rw-r--r-- | test/test.c | 12 |
2 files changed, 15 insertions, 2 deletions
diff --git a/test/module.defs b/test/module.defs index 234cb1dcf..0859ddefd 100644 --- a/test/module.defs +++ b/test/module.defs @@ -16,7 +16,6 @@ TEST.libs = $(LIBHB.a) $(foreach n, \ TEST.install.exe = $(PREFIX/)bin/$(notdir $(TEST.exe)) -## add libs from optional modules ifeq (1,$(BZIP2.enabled)) TEST.libs += $(CONTRIB.build/)lib/libbz2.a endif @@ -41,4 +40,8 @@ ifeq ($(BUILD.system),darwin) TEST.GCC.l += bz2 z else ifeq ($(BUILD.system),linux) TEST.GCC.l += bz2 z pthread dl m +else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) + TEST.libs += $(CONTRIB.build/)lib/libpthreadGC2.a + TEST.GCC.D += PTW32_STATIC_LIB + TEST.GCC.l += iberty ws2_32 endif diff --git a/test/test.c b/test/test.c index 7b4c67899..3273c5716 100644 --- a/test/test.c +++ b/test/test.c @@ -154,6 +154,11 @@ int main( int argc, char ** argv ) return 1; } +#ifdef PTW32_STATIC_LIB + pthread_win32_process_attach_np(); + pthread_win32_thread_attach_np(); +#endif + /* Register our error handler */ hb_register_error_handler(&hb_cli_error_handler); @@ -210,7 +215,7 @@ int main( int argc, char ** argv ) /* Wait... */ while( !die ) { -#if !defined(SYS_BEOS) +#if !defined(SYS_BEOS) && !defined(__MINGW32__) fd_set fds; struct timeval tv; int ret; @@ -299,6 +304,11 @@ int main( int argc, char ** argv ) fprintf( stderr, "HandBrake has exited.\n" ); +#ifdef PTW32_STATIC_LIB + pthread_win32_thread_detach_np(); + pthread_win32_process_detach_np(); +#endif + return 0; } |