Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't export vorbisenc functions from vorbis.dll with CMake #64

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ EXTRA_DIST = \
vorbis-uninstalled.pc.in \
vorbisenc-uninstalled.pc.in \
vorbisfile-uninstalled.pc.in \
symbian macosx win32 \
CMakeLists.txt cmake/FindOgg.cmake cmake/VorbisConfig.cmake.in
symbian macosx cmake win32 \
CMakeLists.txt

DISTCHECK_CONFIGURE_FLAGS = --enable-docs

Expand Down
51 changes: 51 additions & 0 deletions cmake/vorbis.def
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
; vorbis.def
;
LIBRARY
EXPORTS
_floor_P
_mapping_P
_residue_P
;
vorbis_info_init
vorbis_info_clear
vorbis_info_blocksize
;
vorbis_comment_init
vorbis_comment_add
vorbis_comment_add_tag
vorbis_comment_query
vorbis_comment_query_count
vorbis_comment_clear
;
vorbis_block_init
vorbis_block_clear
vorbis_dsp_clear
vorbis_granule_time
;
vorbis_analysis_init
vorbis_commentheader_out
vorbis_analysis_headerout
vorbis_analysis_buffer
vorbis_analysis_wrote
vorbis_analysis_blockout
vorbis_analysis
vorbis_bitrate_addblock
vorbis_bitrate_flushpacket
;
vorbis_synthesis_headerin
vorbis_synthesis_init
vorbis_synthesis_restart
vorbis_synthesis
vorbis_synthesis_trackonly
vorbis_synthesis_blockin
vorbis_synthesis_pcmout
vorbis_synthesis_lapout
vorbis_synthesis_read
vorbis_packet_blocksize
vorbis_synthesis_halfrate
vorbis_synthesis_halfrate_p
vorbis_synthesis_idheader
;
vorbis_window
;_analysis_output_always
vorbis_version_string
7 changes: 2 additions & 5 deletions lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,8 @@ set(VORBISENC_SOURCES
)

if(WIN32)
list(APPEND VORBIS_SOURCES vorbisenc.c)
endif()

if(WIN32)
list(APPEND VORBIS_SOURCES ../win32/vorbis.def)
# win32/vorbis.def exports vorbisenc functions, we don't use it
list(APPEND VORBIS_SOURCES ../cmake/vorbis.def)
list(APPEND VORBISENC_SOURCES ../win32/vorbisenc.def)
list(APPEND VORBISFILE_SOURCES ../win32/vorbisfile.def)
endif()
Expand Down