From b40b5b325a446a8f27043ac87a3813e3050c8e66 Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Fri, 8 Jun 2007 00:37:24 +0000 Subject: [PATCH] Killed off setup.h - only feature still controlled by it was PRS export, which in its current state is worthless. It can be re-enabled by defining USE_PRS=1 during build. Originally committed to SVN as r1215. --- aegisub/Makefile.am | 1 - aegisub/ass_dialogue.cpp | 1 - aegisub/ass_dialogue.h | 1 - aegisub/frame_main_events.cpp | 1 - aegisub/setup.cpp | 1 - aegisub/setup0.h | 60 --------------------------------- aegisub/spellchecker.cpp | 1 - aegisub/stdwx.h | 1 - aegisub/subs_edit_box.cpp | 1 - aegisub/subtitle_format.cpp | 1 - aegisub/subtitle_format_prs.cpp | 1 - aegisub/subtitle_format_prs.h | 1 - aegisub/thesaurus.cpp | 1 - aegisub/video_box.cpp | 1 - aegisub/video_context.cpp | 1 - aegisub/video_provider.cpp | 1 - 16 files changed, 75 deletions(-) delete mode 100644 aegisub/setup0.h diff --git a/aegisub/Makefile.am b/aegisub/Makefile.am index 6e0096a3f..3c1400d99 100644 --- a/aegisub/Makefile.am +++ b/aegisub/Makefile.am @@ -86,7 +86,6 @@ EXTRA_aegisub_SOURCES = \ dialog_associations.cpp \ factory.h \ lavc_file.cpp \ - setup0.h \ setup.cpp \ spellchecker_hunspell.cpp \ stdwx.cpp \ diff --git a/aegisub/ass_dialogue.cpp b/aegisub/ass_dialogue.cpp index 83dbf3fac..00f41281f 100644 --- a/aegisub/ass_dialogue.cpp +++ b/aegisub/ass_dialogue.cpp @@ -38,7 +38,6 @@ // Includes #include #include -#include "setup.h" #include "ass_dialogue.h" #include "ass_override.h" #include "vfr.h" diff --git a/aegisub/ass_dialogue.h b/aegisub/ass_dialogue.h index 3db41036c..a924747d1 100644 --- a/aegisub/ass_dialogue.h +++ b/aegisub/ass_dialogue.h @@ -39,7 +39,6 @@ //////////// // Includes -#include "setup.h" #include #include "ass_entry.h" #include "ass_time.h" diff --git a/aegisub/frame_main_events.cpp b/aegisub/frame_main_events.cpp index 41b06a796..a236898b4 100644 --- a/aegisub/frame_main_events.cpp +++ b/aegisub/frame_main_events.cpp @@ -36,7 +36,6 @@ /////////////////// // Include headers -#include "setup.h" #include #include #include diff --git a/aegisub/setup.cpp b/aegisub/setup.cpp index 57ccf4d6f..af6b94d20 100644 --- a/aegisub/setup.cpp +++ b/aegisub/setup.cpp @@ -37,7 +37,6 @@ /////////// // Headers #include -#include "setup.h" ////////////////////////////////// diff --git a/aegisub/setup0.h b/aegisub/setup0.h deleted file mode 100644 index e8de428c0..000000000 --- a/aegisub/setup0.h +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright (c) 2006, Rodrigo Braz Monteiro -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// * Neither the name of the Aegisub Group nor the names of its contributors -// may be used to endorse or promote products derived from this software -// without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. -// -// ----------------------------------------------------------------------------- -// -// AEGISUB -// -// Website: http://aegisub.cellosoft.com -// Contact: mailto:zeratul@cellosoft.com -// - - -// -// This is a configuration file for the Aegisub project -// -// In order to use it, copy it as setup.h and edit anything you might want there -// DO NOT commit your personal setup.h to the repository -// - - -//////////////////////// -// Enable PRS Exporting -// Requires: wxPNG library -#define USE_PRS 1 - - -///////////////////// -// Enable FexTracker -// Requires: Win32, FexTracker library -#define USE_FEXTRACKER 1 - - -///////////////// -// Enable LibASS -// Requires: libass library -#define USE_LIBASS 0 diff --git a/aegisub/spellchecker.cpp b/aegisub/spellchecker.cpp index 0807e7377..d02f80b7b 100644 --- a/aegisub/spellchecker.cpp +++ b/aegisub/spellchecker.cpp @@ -36,7 +36,6 @@ /////////// // Headers -#include "setup.h" #include "spellchecker.h" #include "options.h" diff --git a/aegisub/stdwx.h b/aegisub/stdwx.h index 336494d80..c86279a68 100644 --- a/aegisub/stdwx.h +++ b/aegisub/stdwx.h @@ -52,7 +52,6 @@ ///////// // Setup -#include "setup.h" #define WIN32_LEAN_AND_MEAN diff --git a/aegisub/subs_edit_box.cpp b/aegisub/subs_edit_box.cpp index cb3fd9011..eebd964d7 100644 --- a/aegisub/subs_edit_box.cpp +++ b/aegisub/subs_edit_box.cpp @@ -36,7 +36,6 @@ //////////// // Includes -#include "setup.h" #include #include #include "subs_edit_box.h" diff --git a/aegisub/subtitle_format.cpp b/aegisub/subtitle_format.cpp index 5ad448ea9..df7b8caa2 100644 --- a/aegisub/subtitle_format.cpp +++ b/aegisub/subtitle_format.cpp @@ -36,7 +36,6 @@ /////////// // Headers -#include "setup.h" #include "subtitle_format.h" #include "subtitle_format_ass.h" #include "subtitle_format_srt.h" diff --git a/aegisub/subtitle_format_prs.cpp b/aegisub/subtitle_format_prs.cpp index eb914bf72..04489adc2 100644 --- a/aegisub/subtitle_format_prs.cpp +++ b/aegisub/subtitle_format_prs.cpp @@ -36,7 +36,6 @@ /////////// // Headers -#include "setup.h" #if USE_PRS == 1 #include #include diff --git a/aegisub/subtitle_format_prs.h b/aegisub/subtitle_format_prs.h index 24ead9828..2ea55caac 100644 --- a/aegisub/subtitle_format_prs.h +++ b/aegisub/subtitle_format_prs.h @@ -39,7 +39,6 @@ /////////// // Headers -#include "setup.h" #if USE_PRS == 1 #include "subtitle_format.h" #include diff --git a/aegisub/thesaurus.cpp b/aegisub/thesaurus.cpp index f5a8154b8..1549e9b78 100644 --- a/aegisub/thesaurus.cpp +++ b/aegisub/thesaurus.cpp @@ -36,7 +36,6 @@ /////////// // Headers -#include "setup.h" #include "thesaurus.h" #include "thesaurus_myspell.h" diff --git a/aegisub/video_box.cpp b/aegisub/video_box.cpp index 14e7d93bd..cc2bab084 100644 --- a/aegisub/video_box.cpp +++ b/aegisub/video_box.cpp @@ -48,7 +48,6 @@ #include "frame_main.h" #include "toggle_bitmap.h" #include "options.h" -#include "setup.h" #include "subs_grid.h" #include "video_provider.h" #include "ass_file.h" diff --git a/aegisub/video_context.cpp b/aegisub/video_context.cpp index 16948c8b1..46aa31d0c 100644 --- a/aegisub/video_context.cpp +++ b/aegisub/video_context.cpp @@ -36,7 +36,6 @@ //////////// // Includes -#include "setup.h" #ifdef HAVE_APPLE_OPENGL_FRAMEWORK #include #include diff --git a/aegisub/video_provider.cpp b/aegisub/video_provider.cpp index 9e400d42f..c44dff8d2 100644 --- a/aegisub/video_provider.cpp +++ b/aegisub/video_provider.cpp @@ -39,7 +39,6 @@ #include "video_provider.h" #include "video_provider_dummy.h" #include "options.h" -#include "setup.h" #include "vfr.h"