From b16bbfa60cf620a6b153772d44a3839e794152e4 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Mon, 27 Jan 2014 19:58:24 +0100 Subject: [PATCH] Happy new year 2014! --- ReadMe.txt | 2 +- src/checksum.cpp | 2 +- src/checksum.h | 2 +- src/global.cpp | 2 +- src/global.h | 2 +- src/job_object.cpp | 2 +- src/job_object.h | 2 +- src/main.cpp | 2 +- src/model_jobList.cpp | 2 +- src/model_jobList.h | 2 +- src/model_logFile.cpp | 2 +- src/model_logFile.h | 2 +- src/model_options.cpp | 2 +- src/model_options.h | 2 +- src/model_preferences.cpp | 2 +- src/model_preferences.h | 2 +- src/model_recently.cpp | 2 +- src/model_recently.h | 2 +- src/model_status.h | 2 +- src/taskbar7.cpp | 2 +- src/taskbar7.h | 2 +- src/thread_avisynth.cpp | 2 +- src/thread_avisynth.h | 2 +- src/thread_encode.cpp | 2 +- src/thread_encode.h | 2 +- src/thread_updater.cpp | 2 +- src/thread_updater.h | 2 +- src/thread_vapoursynth.cpp | 2 +- src/thread_vapoursynth.h | 2 +- src/version.h | 2 +- src/win_addJob.cpp | 2 +- src/win_addJob.h | 2 +- src/win_editor.cpp | 2 +- src/win_editor.h | 2 +- src/win_help.cpp | 2 +- src/win_help.h | 2 +- src/win_main.cpp | 15 +++++++++------ src/win_main.h | 5 ++--- src/win_preferences.cpp | 2 +- src/win_preferences.h | 2 +- src/win_updater.cpp | 2 +- src/win_updater.h | 2 +- x264_launcher_MSVC2013.vcxproj | 20 ++++++++++---------- x264_launcher_MSVC2013.vcxproj.filters | 18 +++++++++--------- 44 files changed, 70 insertions(+), 68 deletions(-) diff --git a/ReadMe.txt b/ReadMe.txt index fc2bc07..581082f 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -1,5 +1,5 @@ Simple x264 Launcher - use 64-Bit x264 with 32-Bit Avisynth -Copyright (C) 2004-2013 LoRd_MuldeR +Copyright (C) 2004-2014 LoRd_MuldeR 1. Introduction diff --git a/src/checksum.cpp b/src/checksum.cpp index b4f121a..c160155 100644 --- a/src/checksum.cpp +++ b/src/checksum.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/checksum.h b/src/checksum.h index d099331..d31828a 100644 --- a/src/checksum.h +++ b/src/checksum.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/global.cpp b/src/global.cpp index e9076cd..f7fb5f4 100644 --- a/src/global.cpp +++ b/src/global.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/global.h b/src/global.h index 3835000..3206cb6 100644 --- a/src/global.h +++ b/src/global.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/job_object.cpp b/src/job_object.cpp index 94f80fc..a3eacd0 100644 --- a/src/job_object.cpp +++ b/src/job_object.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/job_object.h b/src/job_object.h index d2a7659..a3555a1 100644 --- a/src/job_object.h +++ b/src/job_object.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // LameXP - Audio Encoder Front-End -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/main.cpp b/src/main.cpp index 5507df7..7d1f508 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_jobList.cpp b/src/model_jobList.cpp index 9e3aa81..67a891d 100644 --- a/src/model_jobList.cpp +++ b/src/model_jobList.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_jobList.h b/src/model_jobList.h index 9357fd7..a941a7e 100644 --- a/src/model_jobList.h +++ b/src/model_jobList.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_logFile.cpp b/src/model_logFile.cpp index c5fb702..86359e1 100644 --- a/src/model_logFile.cpp +++ b/src/model_logFile.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_logFile.h b/src/model_logFile.h index 235e617..3d58ec5 100644 --- a/src/model_logFile.h +++ b/src/model_logFile.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_options.cpp b/src/model_options.cpp index 1abbe09..26dc410 100644 --- a/src/model_options.cpp +++ b/src/model_options.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_options.h b/src/model_options.h index 20fa814..548a6ec 100644 --- a/src/model_options.h +++ b/src/model_options.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_preferences.cpp b/src/model_preferences.cpp index b324a4d..3bd82d9 100644 --- a/src/model_preferences.cpp +++ b/src/model_preferences.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_preferences.h b/src/model_preferences.h index 9be246d..50f9892 100644 --- a/src/model_preferences.h +++ b/src/model_preferences.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_recently.cpp b/src/model_recently.cpp index 0bee02b..1d8b546 100644 --- a/src/model_recently.cpp +++ b/src/model_recently.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_recently.h b/src/model_recently.h index d367bc5..cbcc924 100644 --- a/src/model_recently.h +++ b/src/model_recently.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_status.h b/src/model_status.h index 8f60a0b..db77193 100644 --- a/src/model_status.h +++ b/src/model_status.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/taskbar7.cpp b/src/taskbar7.cpp index c58268d..8f3d5f9 100644 --- a/src/taskbar7.cpp +++ b/src/taskbar7.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/taskbar7.h b/src/taskbar7.h index 1a86871..659d4d0 100644 --- a/src/taskbar7.h +++ b/src/taskbar7.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/thread_avisynth.cpp b/src/thread_avisynth.cpp index e319c3b..e2a2cdb 100644 --- a/src/thread_avisynth.cpp +++ b/src/thread_avisynth.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/thread_avisynth.h b/src/thread_avisynth.h index b58758c..554beaa 100644 --- a/src/thread_avisynth.h +++ b/src/thread_avisynth.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/thread_encode.cpp b/src/thread_encode.cpp index 6ec5f51..293fe68 100644 --- a/src/thread_encode.cpp +++ b/src/thread_encode.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/thread_encode.h b/src/thread_encode.h index af5c6db..3a7215b 100644 --- a/src/thread_encode.h +++ b/src/thread_encode.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/thread_updater.cpp b/src/thread_updater.cpp index 617ba7a..bf5071e 100644 --- a/src/thread_updater.cpp +++ b/src/thread_updater.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/thread_updater.h b/src/thread_updater.h index 1881b57..472a64a 100644 --- a/src/thread_updater.h +++ b/src/thread_updater.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/thread_vapoursynth.cpp b/src/thread_vapoursynth.cpp index 7ec3b8b..60fc8c2 100644 --- a/src/thread_vapoursynth.cpp +++ b/src/thread_vapoursynth.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/thread_vapoursynth.h b/src/thread_vapoursynth.h index 1252d91..e840b76 100644 --- a/src/thread_vapoursynth.h +++ b/src/thread_vapoursynth.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/version.h b/src/version.h index eb9e611..e13ad69 100644 --- a/src/version.h +++ b/src/version.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/win_addJob.cpp b/src/win_addJob.cpp index 145ffdd..4a66de7 100644 --- a/src/win_addJob.cpp +++ b/src/win_addJob.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/win_addJob.h b/src/win_addJob.h index 345712c..40a3f7c 100644 --- a/src/win_addJob.h +++ b/src/win_addJob.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/win_editor.cpp b/src/win_editor.cpp index 7dd211f..7dd7809 100644 --- a/src/win_editor.cpp +++ b/src/win_editor.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/win_editor.h b/src/win_editor.h index a6802bc..01877f7 100644 --- a/src/win_editor.h +++ b/src/win_editor.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/win_help.cpp b/src/win_help.cpp index 71adb10..a6c20d1 100644 --- a/src/win_help.cpp +++ b/src/win_help.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/win_help.h b/src/win_help.h index 89dbd90..5bc42ce 100644 --- a/src/win_help.h +++ b/src/win_help.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/win_main.cpp b/src/win_main.cpp index d7618b9..ac6ac29 100644 --- a/src/win_main.cpp +++ b/src/win_main.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -30,7 +30,6 @@ #include "model_recently.h" #include "thread_avisynth.h" #include "thread_vapoursynth.h" -#include "thread_ipc.h" #include "thread_encode.h" #include "taskbar7.h" #include "win_addJob.h" @@ -110,8 +109,8 @@ MainWindow::MainWindow(const x264_cpu_t *const cpuFeatures) OptionsModel::loadTemplate(m_options, QString::fromLatin1(tpl_last)); //Create IPC thread object - m_ipcThread = new IPCThread(); - connect(m_ipcThread, SIGNAL(instanceCreated(unsigned int)), this, SLOT(instanceCreated(unsigned int)), Qt::QueuedConnection); + //m_ipcThread = new IPCThread(); + //connect(m_ipcThread, SIGNAL(instanceCreated(unsigned int)), this, SLOT(instanceCreated(unsigned int)), Qt::QueuedConnection); //Freeze minimum size setMinimumSize(size()); @@ -213,6 +212,7 @@ MainWindow::~MainWindow(void) X264_DELETE(temp); } + /* if(m_ipcThread->isRunning()) { m_ipcThread->setAbort(); @@ -222,8 +222,9 @@ MainWindow::~MainWindow(void) m_ipcThread->wait(); } } + */ - X264_DELETE(m_ipcThread); + //X264_DELETE(m_ipcThread); X264_DELETE(m_preferences); X264_DELETE(m_recentlyUsed); VapourSynthCheckThread::unload(); @@ -718,6 +719,7 @@ void MainWindow::init(void) updateLabelPos(); //Check for a running instance + /* bool firstInstance = false; if(m_ipcThread->initialize(&firstInstance)) { @@ -733,6 +735,7 @@ void MainWindow::init(void) INIT_ERROR_EXIT(); } } + */ //Check all binaries while(!binaries.isEmpty()) @@ -1369,7 +1372,7 @@ void MainWindow::updateTaskbar(JobStatus status, const QIcon &icon) */ void MainWindow::parseCommandLineArgs(void) { - QStringList files, args = qApp->arguments(); + QStringList files, args = x264_arguments(); while(!args.isEmpty()) { QString current = args.takeFirst(); diff --git a/src/win_main.h b/src/win_main.h index e672ea7..c53d5c6 100644 --- a/src/win_main.h +++ b/src/win_main.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -30,7 +30,6 @@ class QFile; class QLibrary; class PreferencesModel; class RecentlyUsed; -class IPCThread; class QModelIndex; class QLabel; enum JobStatus; @@ -66,7 +65,7 @@ private: bool m_initialized; QLabel *m_label; - IPCThread *m_ipcThread; + //IPCThread *m_ipcThread; JobListModel *m_jobList; OptionsModel *m_options; diff --git a/src/win_preferences.cpp b/src/win_preferences.cpp index a000eba..c571362 100644 --- a/src/win_preferences.cpp +++ b/src/win_preferences.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/win_preferences.h b/src/win_preferences.h index 692dd7b..663a6ae 100644 --- a/src/win_preferences.h +++ b/src/win_preferences.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/win_updater.cpp b/src/win_updater.cpp index bd398ce..dfbb31b 100644 --- a/src/win_updater.cpp +++ b/src/win_updater.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/win_updater.h b/src/win_updater.h index ef9c600..fbd2376 100644 --- a/src/win_updater.h +++ b/src/win_updater.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2013 LoRd_MuldeR +// Copyright (C) 2004-2014 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/x264_launcher_MSVC2013.vcxproj b/x264_launcher_MSVC2013.vcxproj index 1145087..5464f52 100644 --- a/x264_launcher_MSVC2013.vcxproj +++ b/x264_launcher_MSVC2013.vcxproj @@ -311,14 +311,7 @@ copy /Y "$(QTDIR)\plugins\imageformats\qgif4.dll" "$(TargetDir)\imageformats" $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) - - - - - - - - + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" MOC "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" @@ -326,6 +319,13 @@ copy /Y "$(QTDIR)\plugins\imageformats\qgif4.dll" "$(TargetDir)\imageformats" $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\moc\moc_%(Filename).cpp;%(Outputs) + + + + + + + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\moc\moc_%(Filename).cpp" "%(FullPath)" @@ -364,6 +364,7 @@ copy /Y "$(QTDIR)\plugins\imageformats\qgif4.dll" "$(TargetDir)\imageformats" + @@ -375,7 +376,6 @@ copy /Y "$(QTDIR)\plugins\imageformats\qgif4.dll" "$(TargetDir)\imageformats" - @@ -384,11 +384,11 @@ copy /Y "$(QTDIR)\plugins\imageformats\qgif4.dll" "$(TargetDir)\imageformats" + - diff --git a/x264_launcher_MSVC2013.vcxproj.filters b/x264_launcher_MSVC2013.vcxproj.filters index c22f958..14abe90 100644 --- a/x264_launcher_MSVC2013.vcxproj.filters +++ b/x264_launcher_MSVC2013.vcxproj.filters @@ -75,6 +75,9 @@ Header Files + + Header Files + @@ -140,12 +143,6 @@ Generated Files - - Source Files - - - Generated Files - Source Files @@ -188,6 +185,12 @@ Generated Files + + Source Files + + + Generated Files + @@ -232,9 +235,6 @@ Header Files - - Header Files - Header Files