diff options
| -rw-r--r-- | platform/windows/dcpomatic2_batch_debug.bat | 1 | ||||
| -rw-r--r-- | platform/windows/dcpomatic2_debug.bat (renamed from platform/windows/debug.bat) | 0 | ||||
| -rw-r--r-- | platform/windows/wscript | 12 | ||||
| -rw-r--r-- | src/tools/wscript | 2 | ||||
| -rw-r--r-- | test/wscript | 2 |
5 files changed, 11 insertions, 6 deletions
diff --git a/platform/windows/dcpomatic2_batch_debug.bat b/platform/windows/dcpomatic2_batch_debug.bat new file mode 100644 index 000000000..822721134 --- /dev/null +++ b/platform/windows/dcpomatic2_batch_debug.bat @@ -0,0 +1 @@ +gdb.exe -x gdb_script dcpomatic2_batch.exe > %HOMEPATH%/Documents/dcpomatic_debug_log.txt diff --git a/platform/windows/debug.bat b/platform/windows/dcpomatic2_debug.bat index 0baea6b26..0baea6b26 100644 --- a/platform/windows/debug.bat +++ b/platform/windows/dcpomatic2_debug.bat diff --git a/platform/windows/wscript b/platform/windows/wscript index 533b8491b..9c35a10cb 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -158,7 +158,8 @@ File "%cdist_deps%/bin/ffprobe.exe" if debug: print('File "%resources%/gdb_script"', file=f) - print('File "%resources%/debug.bat"', file=f) + print('File "%resources%/dcpomatic2_debug.bat"', file=f) + print('File "%resources%/dcpomatic2_batch_debug.bat"', file=f) print('File "%mingw%/gdb.exe"', file=f) print('File "%mingw%/addr2line.exe"', file=f) else: @@ -285,8 +286,10 @@ File "%binaries%/src/tools/dcpomatic2_kdm.exe" """, file=f) if debug: - print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 Debug.lnk" "$INSTDIR\\bin\\debug.bat" ""', file=f) - print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 Debug\\DCP-o-matic 2 Debug.lnk" "$INSTDIR\\bin\\debug.bat"', file=f) + print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 debug.lnk" "$INSTDIR\\bin\\dcpomatic2_debug.bat" ""', file=f) + print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 Debug\\DCP-o-matic 2 Debug.lnk" "$INSTDIR\\bin\\dcpomatic2_debug.bat"', file=f) + print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 batch converter debug.lnk" "$INSTDIR\\bin\\dcpomatic2_batch_debug.bat" ""', file=f) + print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 Debug\\\\DCP-o-matic 2 batch converter debug.lnk" "$INSTDIR\\bin\\dcpomatic2_batch_debug.bat" ""', file=f) print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 Debug\\Uninstall DCP-o-matic 2 Debug.lnk" "$INSTDIR\\Uninstall.exe"', file=f) print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic 2 Debug" "DisplayName" "DCP-o-matic 2 Debug (remove only)"', file=f) print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic 2 Debug" "UninstallString" "$INSTDIR\\Uninstall.exe"', file=f) @@ -345,7 +348,8 @@ SectionEnd Section "Uninstall" RMDir /r "$INSTDIR\\*.*" RMDir "$INSTDIR" -Delete "$DESKTOP\\DCP-o-matic 2 Debug.lnk" +Delete "$DESKTOP\\DCP-o-matic 2 debug.lnk" +Delete "$DESKTOP\\DCP-o-matic 2 batch converter debug.lnk" Delete "$SMPROGRAMS\\DCP-o-matic 2 Debug\\*.*" RmDir "$SMPROGRAMS\\DCP-o-matic 2 Debug" DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\DCP-o-matic 2 Debug" diff --git a/src/tools/wscript b/src/tools/wscript index 76c87598f..0670dd852 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -33,7 +33,7 @@ def build(bld): uselib += 'ICU NETTLE ' if bld.env.TARGET_WINDOWS: - uselib += 'WINSOCK2' + uselib += 'WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK BOOST_LOCALE ' for t in ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create']: obj = bld(features='cxx cxxprogram') diff --git a/test/wscript b/test/wscript index a7a406856..ec4cbb068 100644 --- a/test/wscript +++ b/test/wscript @@ -36,7 +36,7 @@ def build(bld): obj.uselib = 'BOOST_TEST BOOST_THREAD BOOST_FILESYSTEM BOOST_DATETIME SNDFILE SAMPLERATE DCP FONTCONFIG CAIROMM PANGOMM XMLPP ' obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML MAGICK SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU NETTLE ' if bld.env.TARGET_WINDOWS: - obj.uselib += 'WINSOCK2' + obj.uselib += 'WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK BOOST_LOCALE ' obj.use = 'libdcpomatic2' obj.source = """ 4k_test.cc |