projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: move some methods from util to memory_util.
[dcpomatic.git]
/
src
/
lib
/
wscript
diff --git
a/src/lib/wscript
b/src/lib/wscript
index 2965111ad1aee303bc844ff16ab9027634777e79..5f8a6cff7129477d55cff3d961d7c6d999ca1974 100644
(file)
--- a/
src/lib/wscript
+++ b/
src/lib/wscript
@@
-83,7
+83,6
@@
sources = """
dkdm_recipient.cc
dkdm_wrapper.cc
dolby_cp750.cc
dkdm_recipient.cc
dkdm_wrapper.cc
dolby_cp750.cc
- edid.cc
emailer.cc
empty.cc
encoder.cc
emailer.cc
empty.cc
encoder.cc
@@
-103,13
+102,14
@@
sources = """
ffmpeg_content.cc
ffmpeg_decoder.cc
ffmpeg_encoder.cc
ffmpeg_content.cc
ffmpeg_decoder.cc
ffmpeg_encoder.cc
- ffmpeg_file_encoder.cc
ffmpeg_examiner.cc
ffmpeg_examiner.cc
+ ffmpeg_file_encoder.cc
+ ffmpeg_image_proxy.cc
ffmpeg_stream.cc
ffmpeg_subtitle_stream.cc
ffmpeg_stream.cc
ffmpeg_subtitle_stream.cc
+ ffmpeg_wrapper.cc
film.cc
filter.cc
film.cc
filter.cc
- ffmpeg_image_proxy.cc
font.cc
font_data.cc
frame_interval_checker.cc
font.cc
font_data.cc
frame_interval_checker.cc
@@
-127,12
+127,16
@@
sources = """
job_manager.cc
j2k_encoder.cc
json_server.cc
job_manager.cc
j2k_encoder.cc
json_server.cc
- kdm_
with_metadata
.cc
+ kdm_
cli
.cc
kdm_recipient.cc
kdm_recipient.cc
+ kdm_with_metadata.cc
log.cc
log_entry.cc
log.cc
log_entry.cc
+ maths_util.cc
+ memory_util.cc
mid_side_decoder.cc
overlaps.cc
mid_side_decoder.cc
overlaps.cc
+ pixel_quanta.cc
player.cc
player_text.cc
player_video.cc
player.cc
player_text.cc
player_video.cc
@@
-214,8
+218,8
@@
def build(bld):
if bld.env.TARGET_LINUX:
obj.uselib += ' POLKIT'
if bld.env.TARGET_LINUX:
obj.uselib += ' POLKIT'
- if bld.env.TARGET_WINDOWS:
- obj.uselib += ' WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE SETUPAPI'
+ if bld.env.TARGET_WINDOWS
_64 or bld.env.TARGET_WINDOWS_32
:
+ obj.uselib += ' WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE SETUPAPI
OLE32 UUID
'
obj.source += ' cross_windows.cc'
if bld.env.TARGET_OSX:
obj.source += ' cross_osx.cc'
obj.source += ' cross_windows.cc'
if bld.env.TARGET_OSX:
obj.source += ' cross_osx.cc'