4 files changed, 20 insertions, 19 deletions
diff --git a/run/dvdomatic b/run/dcpomatic
index 147c001cd..7ea08778c 100755
--- a/run/dvdomatic
+++ b/run/dcpomatic
@@ -3,13 +3,13 @@
 export LD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:$LD_LIBRARY_PATH
 if [ "$1" == "--debug" ]; then
     shift
-    gdb --args build/src/tools/dvdomatic "$*"
+    gdb --args build/src/tools/dcpomatic $*
 elif [ "$1" == "--valgrind" ]; then
     shift
-    valgrind --tool="memcheck" build/src/tools/dvdomatic $*
+    valgrind --tool="memcheck" build/src/tools/dcpomatic $*
 elif [ "$1" == "--i18n" ]; then
     shift
-    LANGUAGE=fr_FR.UTF8 LANG=fr_FR.UTF8 build/src/tools/dvdomatic "$*"
+    LANGUAGE=fr_FR.UTF8 LANG=fr_FR.UTF8 build/src/tools/dcpomatic "$*"
 else
-    build/src/tools/dvdomatic "$*"
+    build/src/tools/dcpomatic $*
 fi
diff --git a/run/dcpomatic.bat b/run/dcpomatic.bat
new file mode 100644
index 000000000..abc867eff
--- /dev/null
+++ b/run/dcpomatic.bat
@@ -0,0 +1,4 @@
+
+set PATH=%PATH%:src\lib:..\..\Environments\64\bin
+build\src\tools\dvdomatic.exe
+pause
+\ No newline at end of file
diff --git a/run/dcpomatic_cli b/run/dcpomatic_cli
new file mode 100755
index 000000000..bf2f08015
--- /dev/null
+++ b/run/dcpomatic_cli
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH:build/src
+if [ "$1" == "--debug" ]; then
+    shift
+    gdb --args build/src/tools/dcpomatic_cli "$@"
+elif [ "$1" == "--valgrind" ]; then
+    shift
+    valgrind --tool="memcheck" --leak-check=full --show-reachable=yes build/src/tools/dcpomatic_cli "$@"
+else
+    build/src/tools/dcpomatic_cli "$@"
+fi
diff --git a/run/makedcp b/run/makedcp
deleted file mode 100755
index 2b95ea165..000000000
--- a/run/makedcp
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH:build/src
-if [ "$1" == "--debug" ]; then
-    shift
-    gdb --args build/src/tools/makedcp "$@"
-elif [ "$1" == "--memcheck" ]; then
-    shift
-    valgrind --tool="memcheck" --leak-check=full --show-reachable=yes build/src/tools/makedcp "$@"
-elif [ "$1" == "--massif" ]; then
-    shift
-    valgrind --tool="massif" build/src/tools/makedcp "$@"
-else
-    build/src/tools/makedcp "$@"
-fi