From 5db559265f548bb909d661271cae40e414629b8e Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Thu, 1 Nov 2012 11:11:51 -0700
Subject: [PATCH] Drop support for config_windows.h

---
 .../Aegisub.DefaultConfiguration.props        |   1 -
 aegisub/build/Aegisub/Aegisub.targets         |  39 ++---
 aegisub/build/Aegisub/Aegisub.xml             |   7 -
 aegisub/src/config.h                          |  21 +--
 aegisub/src/config/config_windows0.h          | 145 ------------------
 5 files changed, 14 insertions(+), 199 deletions(-)
 delete mode 100644 aegisub/src/config/config_windows0.h

diff --git a/aegisub/build/Aegisub/Aegisub.DefaultConfiguration.props b/aegisub/build/Aegisub/Aegisub.DefaultConfiguration.props
index a3695537b..32fbf6973 100644
--- a/aegisub/build/Aegisub/Aegisub.DefaultConfiguration.props
+++ b/aegisub/build/Aegisub/Aegisub.DefaultConfiguration.props
@@ -36,7 +36,6 @@
   <!-- Default settings for build-time options -->
 
   <PropertyGroup>
-    <AegisubUseConfigWindowsH Condition="'$(AegisubUseConfigWindowsH)'==''">true</AegisubUseConfigWindowsH>
     <AegisubUseDSound Condition="'$(AegisubUseDSound)'==''">true</AegisubUseDSound>
     <DirectXSDKPath Condition="'$(DirectXSDKPath)'==''">$(DXSDK_DIR)</DirectXSDKPath>
     <AegisubUseAvisynth Condition="'$(AegisubUseAvisynth)|$(Platform)'=='|Win32'">true</AegisubUseAvisynth>
diff --git a/aegisub/build/Aegisub/Aegisub.targets b/aegisub/build/Aegisub/Aegisub.targets
index 9d75a2d44..f5d14ff87 100644
--- a/aegisub/build/Aegisub/Aegisub.targets
+++ b/aegisub/build/Aegisub/Aegisub.targets
@@ -61,13 +61,12 @@
       />
   </Target>
 
-
   <!-- Default configuration -->
   <Import Project="$(MSBuildThisFileDirectory)Aegisub.DefaultConfiguration.props" />
 
 
   <!-- Build credit text -->
-  <PropertyGroup Condition="'$(AegisubUseConfigWindowsH)'=='false' and '$(AegisubBuildCredit)'==''">
+  <PropertyGroup Condition="'$(AegisubBuildCredit)'==''">
     <AegisubBuildCredit>Anonymous</AegisubBuildCredit>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(AegisubBuildCredit)'!=''">
@@ -76,24 +75,10 @@
     </ClCompile>
   </ItemDefinitionGroup>
 
-  <!-- Skip config_windows.h support -->
-  <ItemDefinitionGroup Condition="'$(AegisubUseConfigWindowsH)'=='false'">
-    <ClCompile>
-      <PreprocessorDefinitions>BUILD_SKIP_CONFIG_WINDOWS_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <!-- Use config_windows.h support -->
-  <ItemGroup Condition="'$(AegisubUseConfigWindowsH)'!='false'">
-    <CreateDefaultConfigurationHeader Include="$(AegisubSourceBase)src\config\config_windows.h">
-      <TemplateFile>$(AegisubSourceBase)src\config\config_windows0.h</TemplateFile>
-      <TargetFile>$(AegisubSourceBase)src\config\config_windows.h</TargetFile>
-    </CreateDefaultConfigurationHeader>
-  </ItemGroup>
-
   <!-- Automation Lua support -->
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_AUTO4_LUA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WITH_AUTO4_LUA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(AegisubContribBase)lua51\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -101,7 +86,7 @@
   <!-- Hunspell support -->
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_HUNSPELL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WITH_HUNSPELL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(AegisubContribBase)hunspell\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -109,14 +94,14 @@
   <!-- CSRI helper library support -->
   <ItemDefinitionGroup Condition="'$(AegisubUseCsri)'=='HelperLibrary'">
     <ClCompile>
-      <PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_CSRI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WITH_CSRI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
 
   <!-- CSRI external library support -->
   <ItemDefinitionGroup Condition="'$(AegisubUseCsri)'=='External'">
     <ClCompile>
-      <PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_CSRI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WITH_CSRI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(CsriLibraryPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -127,7 +112,7 @@
   <!-- libass support -->
   <ItemDefinitionGroup Condition="'$(AegisubUseLibass)'=='true'">
     <ClCompile>
-      <PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_LIBASS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WITH_LIBASS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(LibassIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
@@ -139,7 +124,7 @@
   <!-- Freetype 2 support -->
   <ItemDefinitionGroup Condition="'$(AegisubUseFreetype2)'=='true'">
     <ClCompile>
-      <PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_FREETYPE2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WITH_FREETYPE2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(Ft2IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
@@ -151,7 +136,7 @@
   <!-- FFmpegSource support -->
   <ItemDefinitionGroup Condition="'$(AegisubUseFfms)'=='true'">
     <ClCompile>
-      <PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_FFMS2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WITH_FFMS2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(FFmpegSourceIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
@@ -163,14 +148,14 @@
   <!-- Avisynth support -->
   <ItemDefinitionGroup Condition="'$(AegisubUseAvisynth)'=='true'">
     <ClCompile>
-      <PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_AVISYNTH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WITH_AVISYNTH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
 
   <!-- FFTW support -->
   <ItemDefinitionGroup Condition="'$(AegisubUseFftw)'=='true'">
     <ClCompile>
-      <PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_FFTW3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WITH_FFTW3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(FftwIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
@@ -185,7 +170,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(AegisubUseDSound)'=='true'">
     <ClCompile>
-      <PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_DIRECTSOUND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WITH_DIRECTSOUND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(DXSDK_DIR)\Include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
@@ -205,7 +190,7 @@
   </ItemGroup>
 
   <!-- Special builds -->
-  <ItemDefinitionGroup Condition="'$(AegisubUseConfigWindowsH)'=='false'">
+  <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions Condition="'$(AegisubSpecialBuild)'=='FinalRelease'">FINAL_RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(AegisubSpecialBuild)'=='StartupLog'">WITH_STARTUPLOG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/aegisub/build/Aegisub/Aegisub.xml b/aegisub/build/Aegisub/Aegisub.xml
index 4bc87f923..c2f9e065c 100644
--- a/aegisub/build/Aegisub/Aegisub.xml
+++ b/aegisub/build/Aegisub/Aegisub.xml
@@ -46,13 +46,6 @@
     <Category Name="Paths" DisplayName="Library paths" Description="Configure third-party library paths" />
     <Category Name="BuildInfo" DisplayName="Build information" Description="Embed build information" />
   </Rule.Categories>
-  
-  <BoolProperty
-    Name="AegisubUseConfigWindowsH"
-    Category="Features"
-    DisplayName="Use config_windows.h"
-    Description="Specify whether to use config_windows.h or the configuration on this page to control features. The settings on this page still control automatic compiler and link settings for the features."
-    />
 
   <BoolProperty
     Name="AegisubUseDSound"
diff --git a/aegisub/src/config.h b/aegisub/src/config.h
index 6a606921c..6ad25af2b 100644
--- a/aegisub/src/config.h
+++ b/aegisub/src/config.h
@@ -1,23 +1,6 @@
 #ifndef AGI_PRE
-
-#ifdef _WIN32
-
-// Define min and max macros to identity.
-// This will prevent WinDef.h defining them to functions, which prevents
-// using std::min and std::max.
-#define min min
-#define max max
-
-// Windows specific settings
-#ifndef BUILD_SKIP_CONFIG_WINDOWS_H
-#include "config/config_windows.h"
-#endif
-
-#else
-
+#ifndef _WIN32
 // Generated by configure.in
 #include "../acconf.h"
-
-#endif // __WINDOWS__
-
+#endif
 #endif // AGI_PRE
diff --git a/aegisub/src/config/config_windows0.h b/aegisub/src/config/config_windows0.h
deleted file mode 100644
index 693a94ed9..000000000
--- a/aegisub/src/config/config_windows0.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) 2007, 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 Project http://www.aegisub.org/
-
-/// @file config/config_windows0.h
-/// @brief Base configuration for Windows builds, to be copied to config_windows.h and edited by the developer
-/// @ingroup build
-///
-
-#pragma once
-
-// Build credit: Set this to a string with your name as you want it to appear on the program
-#ifndef BUILD_CREDIT
-#define BUILD_CREDIT "Anonymous"
-#endif
-
-// Endianness: We don't support any Windows version that runs on big endian
-#define HAVE_LITTLE_ENDIAN
-#undef HAVE_BIG_ENDIAN
-
-////////////// HIGH PRIORITY /////////////
-
-// Enable Automation 4 Lua
-// Requires: Lua 5.1 (in repository)
-#define WITH_AUTO4_LUA
-
-// Enable DirectSound audio player
-// Requires: DirectX SDK
-#define WITH_DIRECTSOUND
-#ifdef WITH_DIRECTSOUND
-#pragma comment(lib, "dsound.lib")
-#pragma comment(lib, "dxguid.lib")
-#endif
-
-// Enable Avisynth
-// Requires: nothing (just the avisynth dlls at runtime)
-#define WITH_AVISYNTH
-
-
-// Enable FFMS2 video and audio providers
-// Requires: FFMS2 SDK
-//#define WITH_FFMS2
-#ifdef WITH_FFMS2
-#pragma comment(lib, "ffms2.lib")
-#endif
-
-///////////// MEDIUM PRIORITY ////////////
-
-// Enable CSRI, required for styles previews in the style editor and some video providers
-// Requires: csri (in repository)
-#define WITH_CSRI
-
-
-// Enable Hunspell-based spellchecker
-// Requires: hunspell (in repository for Win32)
-#define WITH_HUNSPELL
-
-
-// Use FFTW instead of shipped FFT code
-// FFTW <http://fftw.org/> is a very fast library for computing the discrete fourier transform, but is a bit
-// tricky to get working on Windows, and has the additional problem of being GPL licensed.
-// Enable this option to use FFTW to get faster rendering of the audio spectrogram
-//#define WITH_FFTW3
-#ifdef WITH_FFTW3
-#pragma comment(lib,libfftw.lib)
-#endif
-// Specify tags the update checker accepts
-// See <http://devel.aegisub.org/wiki/Technical/UpdateChecker> for details on tags.
-// Depending on who will be using your build, you may or may not want to have the
-// "source" tag in here. If the string is empty, the update checker will reject any
-// update offered.
-#if defined(_M_IX86)
-# define UPDATE_CHECKER_ACCEPT_TAGS "windows source"
-#elif defined(_M_X64)
-# define UPDATE_CHECKER_ACCEPT_TAGS "win64 source"
-#endif
-
-// Where the update checker should look for updates
-#define UPDATE_CHECKER_SERVER "updates.aegisub.org"
-#define UPDATE_CHECKER_BASE_URL "/trunk"
-
-///////////// NOT RECOMMENDED /////////////
-
-// Enable FontConfig
-// Requires: fontconfig
-//#define WITH_FONTCONFIG
-#ifdef WITH_FONTCONFIG
-#define WITH_FREETYPE2
-#pragma comment(lib,"libfontconfig.lib")
-#endif
-
-// Enable libass
-// Requires: libass
-//#define WITH_LIBASS
-#ifdef WITH_LIBASS
-#pragma comment(lib, "libass.lib")
-#endif
-
-// Enable PortAudio audio player
-// Requires PortAudio release 19
-//#define WITH_PORTAUDIO
-#ifdef WITH_PORTAUDIO
-#pragma comment(lib,"portaudio_x86.lib")
-#endif
-
-// Enable ALSA audio player
-// Requires Linux and libasound
-//#define WITH_ALSA
-
-// Enable OpenAL audio player
-// Requires OpenAL development libraries and headers
-//#define WITH_OPENAL
-
-// Enable Pulse Audio audio player
-// Requires libpulse (and a *NIX compatible system and a running sound server to actually use)
-//#define WITH_LIBPULSE
-
-// Display trace-level diagnostic messages during startup
-// Only enable for making special builds for end users having trouble with starting Aegisub
-//#define WITH_STARTUPLOG