From ebdf62cd13f7976890cbf3703571fc55a20df47e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Wed, 1 Sep 2004 18:19:49 +0000 Subject: Improvements and implementing Michael's suggestions: - new flags added at the end, so the users can override them properly - removed X11 libs and cflags from xine-config and libxine.pc - removed replacing for setenv (thanks to Robin for the hint) - better way for temporary disabling of w32dll module - data directories will be different on Windows - force installing catalogs with translation into XINE_LOCALEDIR - timer linked in xine-engine (just central place for linking such stuff) - adjusted load_plugins and remove reduntant WIN32 conditionals - removed unused $(lib_thr) CVS patchset: 6927 CVS date: 2004/09/01 18:19:49 --- win32/contrib/Makefile.am | 7 +- win32/contrib/pthreads/Makefile.am | 3 +- win32/libxine.def | 304 ++++++++++++++++++------------------- 3 files changed, 154 insertions(+), 160 deletions(-) (limited to 'win32') diff --git a/win32/contrib/Makefile.am b/win32/contrib/Makefile.am index 135485199..ce9fd2d17 100644 --- a/win32/contrib/Makefile.am +++ b/win32/contrib/Makefile.am @@ -5,15 +5,10 @@ SUBDIRS = zlib pthreads noinst_HEADERS = dirent/dirent.h timer/timer.h if WIN32 -if !HAVE_SETENV -libsetenv = libsetenv.la -endif win32libs = libtimer.la libdirent.la endif -noinst_LTLIBRARIES = $(libsetenv) $(win32libs) - -libsetenv_la_SOURCES = setenv.c +noinst_LTLIBRARIES = $(win32libs) libtimer_la_SOURCES = timer/timer.c diff --git a/win32/contrib/pthreads/Makefile.am b/win32/contrib/pthreads/Makefile.am index dc55b0107..a8dfb0cb2 100644 --- a/win32/contrib/pthreads/Makefile.am +++ b/win32/contrib/pthreads/Makefile.am @@ -1,7 +1,6 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic -#AM_CLFAGS = -I. -D_WIN32_WINNT=0x400 -DHAVE_CONFIG_H -DPTW32_BUILD -D__CLEANUP_C -AM_CPPFLAGS = -D__CLEANUP_C +AM_CPPFLAGS = -D_WIN32_WINNT=0x400 -DHAVE_CONFIG_H -DPTW32_BUILD -D__CLEANUP_C EXTRA_DIST = acconfig.h ANNOUNCE CONTRIBUTIRS COPYING.LIB ChangeLog FAQ MAINTAINERS NEWS PROGRESS README README.CV README.NONPORTABLE README.WinCE TODO WinCE-PORT build.tar.gz config.h.in pthread.def pthread.dsp pthread.dsw diff --git a/win32/libxine.def b/win32/libxine.def index c8fc3c7e7..8727f87f3 100644 --- a/win32/libxine.def +++ b/win32/libxine.def @@ -1,9 +1,10 @@ -;------------------------------------------------------------ -; LIBXINE DLL DEFINITIONS FILE - +;------------------------------------------------------------ +; LIBXINE DLL DEFINITIONS FILE + EXPORTS - + ;---- xine-utils ---- +gettimeofday xine_mm_accel xine_fast_memcpy xine_probe_fast_memcpy @@ -58,121 +59,121 @@ lexer_init lexer_get_token ;---- xine-engine ---- -xine_init -xine_exit -xine_play -xine_stop -xine_eject - -xine_open -xine_close -xine_new -xine_dispose -xine_stream_new -xine_stream_master_slave - -xine_trick_mode -xine_engine_set_param -xine_engine_get_param - -xine_get_status -_x_get_audio_channel -xine_get_audio_lang -;get_audio_decoder -;xine_get_spu_channel -xine_get_spu_lang -;xine_select_spu_channel -_x_get_spu_decoder -xine_get_browsable_input_plugin_ids -xine_get_browse_mrls -xine_get_autoplay_input_plugin_ids -xine_get_autoplay_mrls -xine_get_file_extensions -xine_get_mime_types -xine_get_demux_for_mime_type -xine_get_input_plugin_description -xine_list_video_output_plugins -xine_list_audio_output_plugins -xine_get_current_frame - -xine_get_meta_info - -xine_open_video_driver -xine_open_audio_driver -xine_close_audio_driver -xine_close_video_driver - -xine_log -xine_get_log -xine_get_error -xine_port_send_gui_data - -xine_get_version_string -xine_get_version -xine_check_version -xine_set_param -xine_get_param - -xine_get_current_frame -xine_get_current_vpts -;xine_get_current_info -xine_get_stream_info -xine_get_pos_length - -;xine_set_speed - -xine_post_init -xine_list_post_plugins -xine_list_post_plugins_typed -xine_post_list_inputs -xine_post_list_outputs -xine_post_input -xine_post_output -xine_post_wire -xine_post_wire_video_port -xine_post_wire_audio_port -xine_get_video_source -xine_get_audio_source -xine_post_dispose - -xine_get_log_section_count -xine_get_log_names -xine_register_log_cb - -xine_event_create_listener_thread -xine_event_new_queue -xine_event_send -xine_event_free -xine_event_get -xine_event_wait -xine_event_dispose_queue - -xine_osd_new -xine_osd_draw_point -xine_osd_draw_line -xine_osd_draw_rect -xine_osd_draw_text -xine_osd_draw_bitmap -xine_osd_get_text_size -xine_osd_set_font -xine_osd_set_encoding -xine_osd_set_position -xine_osd_show -xine_osd_hide -xine_osd_clear -xine_osd_set_text_palette -xine_osd_get_palette -xine_osd_set_palette -xine_osd_free - -xine_tvmode_init -xine_tvmode_use -xine_tvmode_set_tvsystem -xine_tvmode_switch -xine_tvmode_size -xine_tvmode_exit - -_x_handle_stream_end +xine_init +xine_exit +xine_play +xine_stop +xine_eject + +xine_open +xine_close +xine_new +xine_dispose +xine_stream_new +xine_stream_master_slave + +xine_trick_mode +xine_engine_set_param +xine_engine_get_param + +xine_get_status +_x_get_audio_channel +xine_get_audio_lang +;get_audio_decoder +;xine_get_spu_channel +xine_get_spu_lang +;xine_select_spu_channel +_x_get_spu_decoder +xine_get_browsable_input_plugin_ids +xine_get_browse_mrls +xine_get_autoplay_input_plugin_ids +xine_get_autoplay_mrls +xine_get_file_extensions +xine_get_mime_types +xine_get_demux_for_mime_type +xine_get_input_plugin_description +xine_list_video_output_plugins +xine_list_audio_output_plugins +xine_get_current_frame + +xine_get_meta_info + +xine_open_video_driver +xine_open_audio_driver +xine_close_audio_driver +xine_close_video_driver + +xine_log +xine_get_log +xine_get_error +xine_port_send_gui_data + +xine_get_version_string +xine_get_version +xine_check_version +xine_set_param +xine_get_param + +xine_get_current_frame +xine_get_current_vpts +;xine_get_current_info +xine_get_stream_info +xine_get_pos_length + +;xine_set_speed + +xine_post_init +xine_list_post_plugins +xine_list_post_plugins_typed +xine_post_list_inputs +xine_post_list_outputs +xine_post_input +xine_post_output +xine_post_wire +xine_post_wire_video_port +xine_post_wire_audio_port +xine_get_video_source +xine_get_audio_source +xine_post_dispose + +xine_get_log_section_count +xine_get_log_names +xine_register_log_cb + +xine_event_create_listener_thread +xine_event_new_queue +xine_event_send +xine_event_free +xine_event_get +xine_event_wait +xine_event_dispose_queue + +xine_osd_new +xine_osd_draw_point +xine_osd_draw_line +xine_osd_draw_rect +xine_osd_draw_text +xine_osd_draw_bitmap +xine_osd_get_text_size +xine_osd_set_font +xine_osd_set_encoding +xine_osd_set_position +xine_osd_show +xine_osd_hide +xine_osd_clear +xine_osd_set_text_palette +xine_osd_get_palette +xine_osd_set_palette +xine_osd_free + +xine_tvmode_init +xine_tvmode_use +xine_tvmode_set_tvsystem +xine_tvmode_switch +xine_tvmode_size +xine_tvmode_exit + +_x_handle_stream_end _x_message _x_find_input_plugin _x_find_demux_plugin @@ -186,7 +187,7 @@ _x_audio_decoder_init _x_audio_decoder_shutdown _x_extra_info_reset _x_extra_info_merge -_x_get_current_info +_x_get_current_info _x_demux_flush_engine _x_demux_control_nop @@ -215,39 +216,39 @@ _x_set_speed _x_select_spu_channel _x_get_audio_channel _x_get_spu_channel - -xine_config_register_string -xine_config_register_range -xine_config_register_enum -xine_config_register_num -xine_config_register_bool -xine_config_get_first_entry -xine_config_get_next_entry -xine_config_lookup_entry -xine_config_update_entry -xine_config_load -xine_config_save -xine_config_reset -xine_config_update_entry - -_x_fourcc_to_buf_video + +xine_config_register_string +xine_config_register_range +xine_config_register_enum +xine_config_register_num +xine_config_register_bool +xine_config_get_first_entry +xine_config_get_next_entry +xine_config_lookup_entry +xine_config_update_entry +xine_config_load +xine_config_save +xine_config_reset +xine_config_update_entry + +_x_fourcc_to_buf_video _x_buf_video_name _x_formattag_to_buf_audio -_x_buf_audio_name -_x_bmiheader_le2me -_x_waveformatex_le2me - -_x_vo_scale_init -_x_vo_scale_compute_output_size -_x_vo_scale_compute_ideal_size -_x_vo_scale_aspect_ratio_name - -_x_io_select -_x_io_tcp_connect -_x_io_tcp_read -_x_io_tcp_write -_x_io_file_read -_x_io_file_write +_x_buf_audio_name +_x_bmiheader_le2me +_x_waveformatex_le2me + +_x_vo_scale_init +_x_vo_scale_compute_output_size +_x_vo_scale_compute_ideal_size +_x_vo_scale_aspect_ratio_name + +_x_io_select +_x_io_tcp_connect +_x_io_tcp_read +_x_io_tcp_write +_x_io_file_read +_x_io_file_write _x_stream_info_set @@ -284,4 +285,3 @@ v_b_table yv12_to_yv12 yuy2_to_yuy2 - -- cgit v1.2.3