From dc803725bf847419b696ac82d4f23f1f0d4c2c39 Mon Sep 17 00:00:00 2001
From: Rodrigo Braz Monteiro <zeratul@cellosoft.com>
Date: Wed, 7 Feb 2007 00:12:15 +0000
Subject: [PATCH] Made Ruby automatically include the libraries it needs, and
 stdwx.h declare WIN32_LEAN_AND_MEAN (which also required a new header
 inclusion on audio_player_dsoun.h)

Originally committed to SVN as r929.
---
 aegisub/audio_player_dsound.h | 1 +
 aegisub/auto4_ruby.cpp        | 9 +++++++++
 aegisub/stdwx.h               | 3 ++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/aegisub/audio_player_dsound.h b/aegisub/audio_player_dsound.h
index 73c3f4490..c48d071fa 100644
--- a/aegisub/audio_player_dsound.h
+++ b/aegisub/audio_player_dsound.h
@@ -42,6 +42,7 @@
 #include "setup.h"
 #if USE_DIRECTSOUND == 1
 #include "audio_player.h"
+#include <mmsystem.h>
 #include <dsound.h>
 
 
diff --git a/aegisub/auto4_ruby.cpp b/aegisub/auto4_ruby.cpp
index 8c3821993..86a4cfa60 100644
--- a/aegisub/auto4_ruby.cpp
+++ b/aegisub/auto4_ruby.cpp
@@ -53,6 +53,15 @@
 #include <assert.h>
 #include <algorithm>
 
+
+///////////////////
+// Include library
+#if __VISUALC__ >= 1200
+#pragma comment(lib,"ws2_32.lib")
+#pragma comment(lib,"msvcr80-ruby19-static.lib")
+#endif
+
+
 namespace Automation4 {
 
 	RubyObjects *RubyObjects::inst = NULL;
diff --git a/aegisub/stdwx.h b/aegisub/stdwx.h
index 173c69571..7a144c839 100644
--- a/aegisub/stdwx.h
+++ b/aegisub/stdwx.h
@@ -53,6 +53,7 @@
 /////////
 // Setup
 #include "setup.h"
+#define WIN32_LEAN_AND_MEAN
 
 
 /////////////////////
@@ -94,7 +95,7 @@
 ///////////////
 // DirectSound
 #if USE_DIRECTSOUND == 1
-#include <dsound.h>
+//#include <dsound.h>
 #endif