Added setup.cpp, which automatically links to everything that Aegisub needs, on MSVC++, and made USE_PORTAUDIO be respected

Originally committed to SVN as r594.
This commit is contained in:
Rodrigo Braz Monteiro 2006-12-23 14:15:04 +00:00
parent 75837c2df5
commit 0accf7431d
4 changed files with 168 additions and 0 deletions

View file

@ -38,7 +38,9 @@
// Headers
#include <wx/wxprec.h>
#include "setup.h"
#if USE_PORTAUDIO == 1
#include "audio_player_portaudio.h"
#endif
#if USE_DIRECTSOUND == 1
#include "audio_player_dsound.h"
#endif
@ -128,7 +130,9 @@ AudioPlayer* AudioPlayer::GetAudioPlayer() {
#endif
// Get PortAudio player
#if USE_PORTAUDIO == 1
if (!player) player = new PortAudioPlayer;
#endif
}
catch (...) {
delete player;

View file

@ -36,6 +36,8 @@
///////////
// Headers
#include "setup.h"
#if USE_PORTAUDIO == 1
#include "audio_player_portaudio.h"
#include "audio_provider.h"
#include "utils.h"
@ -191,3 +193,5 @@ void PortAudioPlayer::CloseStream() {
Pa_CloseStream(stream);
} catch (...) {}
}
#endif

View file

@ -39,6 +39,8 @@
///////////
// Headers
#include "setup.h"
#if USE_PORTAUDIO == 1
#include "audio_player.h"
extern "C" {
#include <portaudio.h>
@ -87,3 +89,5 @@ public:
wxMutex *GetMutex() { return &PAMutex; }
};
#endif

156
core/setup.cpp Normal file
View file

@ -0,0 +1,156 @@
// 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
//
///////////
// Headers
#include <wx/wxprec.h>
#include "setup.h"
//////////////////////////////////
///////// MSVC Libraries /////////
//////////////////////////////////
#if __VISUALC__ >= 1200
/////////////
// wxWidgets
#ifdef __WXDEBUG__
#pragma comment(lib, "wxzlibd.lib")
#pragma comment(lib, "wxpngd.lib")
#else
#pragma comment(lib, "wxzlib.lib")
#pragma comment(lib, "wxpng.lib")
#endif
#if wxCHECK_VERSION(2, 8, 0)
#ifdef __WXDEBUG__
//#pragma comment(lib, "wxmsw28ud_richtext.lib")
//#pragma comment(lib, "wxmsw28ud_html.lib")
#pragma comment(lib, "wxregexud.lib")
#pragma comment(lib, "wxbase28ud.lib")
#pragma comment(lib, "wxmsw28ud_media.lib")
#pragma comment(lib, "wxmsw28ud_core.lib")
#pragma comment(lib, "wxmsw28ud_adv.lib")
#else
//#pragma comment(lib, "wxmsw28u_richtext.lib")
//#pragma comment(lib, "wxmsw28u_html.lib")
#pragma comment(lib, "wxregexu.lib")
#pragma comment(lib, "wxbase28u.lib")
#pragma comment(lib, "wxmsw28u_media.lib")
#pragma comment(lib, "wxmsw28u_core.lib")
#pragma comment(lib, "wxmsw28u_adv.lib")
#endif
#else
#if wxCHECK_VERSION(2, 7, 0)
#ifdef __WXDEBUG__
#pragma comment(lib, "wxregexud.lib")
#pragma comment(lib, "wxbase27ud.lib")
#pragma comment(lib, "wxmsw27ud_media.lib")
#pragma comment(lib, "wxmsw27ud_core.lib")
#pragma comment(lib, "wxmsw27ud_adv.lib")
#else
#pragma comment(lib, "wxregexu.lib")
#pragma comment(lib, "wxbase27u.lib")
#pragma comment(lib, "wxmsw27u_media.lib")
#pragma comment(lib, "wxmsw27u_core.lib")
#pragma comment(lib, "wxmsw27u_adv.lib")
#endif
#else if wxCHECK_VERSION(2, 6, 0)
#ifdef __WXDEBUG__
#pragma comment(lib, "wxregexud.lib")
#pragma comment(lib, "wxbase26ud.lib")
#pragma comment(lib, "wxmsw26ud_media.lib")
#pragma comment(lib, "wxmsw26ud_core.lib")
#pragma comment(lib, "wxmsw26ud_adv.lib")
#else
#pragma comment(lib, "wxregexu.lib")
#pragma comment(lib, "wxbase26u.lib")
#pragma comment(lib, "wxmsw26u_media.lib")
#pragma comment(lib, "wxmsw26u_core.lib")
#pragma comment(lib, "wxmsw26u_adv.lib")
#endif
#endif
#endif // wxWidgets
////////////////////////////
// Standard Win32 Libraries
#pragma comment(lib, "Vfw32.lib")
#pragma comment(lib, "comctl32.lib")
#pragma comment(lib, "rpcrt4.lib")
#pragma comment(lib, "winmm.lib")
#pragma comment(lib, "advapi32.lib")
#pragma comment(lib, "wsock32.lib")
///////////////
// DirectSound
#if USE_DIRECTSOUND == 1
#pragma comment(lib, "dsound.lib")
#pragma comment(lib, "dxguid.lib")
#endif
/////////////
// PortAudio
#if USE_PORTAUDIO == 1
#pragma comment(lib,"portaudio.lib")
#endif
///////
// Lua
#ifdef __WXDEBUG__
#pragma comment(lib,"lua503d.lib")
#else
#pragma comment(lib,"lua503.lib")
#endif
//////////////
// FreeType 2
#ifdef __WXDEBUG__
#pragma comment(lib,"freetype2110MT_D.lib")
#else
#pragma comment(lib,"freetype2110MT.lib")
#endif
#endif // VisualC