From 26302fda391ecf20408b7a8023bb816ee4f935bf Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Fri, 29 May 2009 08:39:36 +0000
Subject: [PATCH] win32: odds and ends to get things compiling in all cases

---
 desmume/src/commandline.cpp             |  2 ++
 desmume/src/windows/DeSmuME_2005.vcproj |  8 ++++++++
 desmume/src/windows/DeSmuME_2008.vcproj | 10 +++++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/desmume/src/commandline.cpp b/desmume/src/commandline.cpp
index e74ef3d6b..c8921bf68 100644
--- a/desmume/src/commandline.cpp
+++ b/desmume/src/commandline.cpp
@@ -19,6 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
+//windows note: make sure this file gets compiled with _cdecl
+
 #include <glib.h>
 
 #include <stdio.h>
diff --git a/desmume/src/windows/DeSmuME_2005.vcproj b/desmume/src/windows/DeSmuME_2005.vcproj
index 3077f093c..98f52b60d 100644
--- a/desmume/src/windows/DeSmuME_2005.vcproj
+++ b/desmume/src/windows/DeSmuME_2005.vcproj
@@ -790,6 +790,14 @@
 		<File
 			RelativePath="..\commandline.cpp"
 			>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					CallingConvention="0"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Release FastBuild|Win32"
 				>
diff --git a/desmume/src/windows/DeSmuME_2008.vcproj b/desmume/src/windows/DeSmuME_2008.vcproj
index 03ae46427..cb485b316 100644
--- a/desmume/src/windows/DeSmuME_2008.vcproj
+++ b/desmume/src/windows/DeSmuME_2008.vcproj
@@ -166,7 +166,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="glib-2.20.1-x86.lib vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib winpcap\wpcap.lib zlib-2008-x32.lib zziplib-2008-x32.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_sse2.exe"
-				AdditionalLibraryDirectories=".\zlib123;.\zziplib;.\winpcap"
+				AdditionalLibraryDirectories=".\zlib123;.\zziplib;.\winpcap;glib-2.20.1\lib"
 				DelayLoadDLLs="wpcap.dll"
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
@@ -329,6 +329,14 @@
 				<File
 					RelativePath="..\commandline.cpp"
 					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							CallingConvention="0"
+						/>
+					</FileConfiguration>
 					<FileConfiguration
 						Name="Release FastBuild|Win32"
 						>