Remove some old stuff.

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 8d1ebf5d3930410672a3788d383143258bffccb5..4972654b27aabd28ed39674c0f672f2575f7c914 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -501,21 +501,12 @@ private:
        }       
 };
 
-#if wxMINOR_VERSION == 9
 static const wxCmdLineEntryDesc command_line_description[] = {
        { wxCMD_LINE_OPTION, "l", "log", "set log level (silent, verbose or timing)", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
        { wxCMD_LINE_SWITCH, "n", "new", "create new film", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
        { wxCMD_LINE_PARAM, 0, 0, "film to load or create", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL },
        { wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 }
 };
-#else
-static const wxCmdLineEntryDesc command_line_description[] = {
-       { wxCMD_LINE_OPTION, wxT("l"), wxT("log"), wxT("set log level (silent, verbose or timing)"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
-       { wxCMD_LINE_SWITCH, wxT("n"), wxT("new"), wxT("create new film"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
-       { wxCMD_LINE_PARAM, 0, 0, wxT("film to load or create"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL },
-       { wxCMD_LINE_NONE, wxT(""), wxT(""), wxT(""), wxCmdLineParamType (0), 0 }
-};
-#endif
 
 class App : public wxApp
 {

diff --git a/src/wx/wscript b/src/wx/wscript
index 8f35e2facea49aa784b761ef4dbb3cc341f3b537..09e78316158d5b2fc464918dd4a89d49c6ad6133 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -69,7 +69,6 @@ def build(bld):
         obj = bld(features = 'cxx cxxshlib')
 
     obj.name   = 'libdcpomatic-wx'
-#    obj.includes = [ '..' ]
     obj.export_includes = ['..']
     obj.uselib = 'WXWIDGETS'
     if bld.env.TARGET_LINUX: