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

@@ -86,7 +86,6 @@ EXTRA_aegisub_SOURCES = \
 	dialog_associations.cpp \
 	factory.h \
 	lavc_file.cpp \
-	setup0.h \
 	setup.cpp \
 	spellchecker_hunspell.cpp \
 	stdwx.cpp \

aegisub/ass_dialogue.cpp

@@ -38,7 +38,6 @@
 // Includes
 #include <fstream>
 #include <wx/tokenzr.h>
-#include "setup.h"
 #include "ass_dialogue.h"
 #include "ass_override.h"
 #include "vfr.h"

aegisub/ass_dialogue.h

@@ -39,7 +39,6 @@
 
 ////////////
 // Includes
-#include "setup.h"
 #include <vector>
 #include "ass_entry.h"
 #include "ass_time.h"

aegisub/frame_main_events.cpp

@@ -36,7 +36,6 @@
 
 ///////////////////
 // Include headers
-#include "setup.h"
 #include <wx/wxprec.h>
 #include <wx/mimetype.h>
 #include <wx/filename.h>

aegisub/setup.cpp

@@ -37,7 +37,6 @@
 ///////////
 // Headers
 #include <wx/wxprec.h>
-#include "setup.h"
 
 
 //////////////////////////////////

aegisub/setup0.h

@@ -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

aegisub/spellchecker.cpp

@@ -36,7 +36,6 @@
 
 ///////////
 // Headers
-#include "setup.h"
 #include "spellchecker.h"
 #include "options.h"
 

aegisub/stdwx.h

@@ -52,7 +52,6 @@
 
 /////////
 // Setup
-#include "setup.h"
 #define WIN32_LEAN_AND_MEAN
 
 

aegisub/subs_edit_box.cpp

@@ -36,7 +36,6 @@
 
 ////////////
 // Includes
-#include "setup.h"
 #include <wx/colordlg.h>
 #include <wx/fontdlg.h>
 #include "subs_edit_box.h"

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"

aegisub/subtitle_format_prs.cpp

@@ -36,7 +36,6 @@
 
 ///////////
 // Headers
-#include "setup.h"
 #if USE_PRS == 1
 #include <wx/image.h>
 #include <wx/mstream.h>

aegisub/subtitle_format_prs.h

@@ -39,7 +39,6 @@
 
 ///////////
 // Headers
-#include "setup.h"
 #if USE_PRS == 1
 #include "subtitle_format.h"
 #include <vector>

aegisub/thesaurus.cpp

@@ -36,7 +36,6 @@
 
 ///////////
 // Headers
-#include "setup.h"
 #include "thesaurus.h"
 #include "thesaurus_myspell.h"
 

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"

aegisub/video_context.cpp

@@ -36,7 +36,6 @@
 
 ////////////
 // Includes
-#include "setup.h"
 #ifdef HAVE_APPLE_OPENGL_FRAMEWORK
 #include <OpenGL/GL.h>
 #include <OpenGL/glu.h>

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"