From 6268f5c1189dae9a527f83181369be42766f391a Mon Sep 17 00:00:00 2001
From: aurhat <szyk@vivaldi.net>
Date: Sun, 20 Sep 2015 13:12:00 +0200
Subject: [PATCH] Remove/adjust dependencies on Windows

---
 source/codeblocks/AssaultCube.cbp                |   4 ++--
 source/lib/{libvorbisfile.lib => vorbisfile.lib} | Bin
 source/vcpp/cube.vcproj                          |  10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename source/lib/{libvorbisfile.lib => vorbisfile.lib} (100%)

diff --git a/source/codeblocks/AssaultCube.cbp b/source/codeblocks/AssaultCube.cbp
index 9894b3ba..fa0063fe 100755
--- a/source/codeblocks/AssaultCube.cbp
+++ b/source/codeblocks/AssaultCube.cbp
@@ -39,7 +39,7 @@
 					<Add library="opengl32" />
 					<Add library="enet" />
 					<Add library="OpenAL32" />
-					<Add library="..\lib\libvorbisfile.lib" />
+					<Add library="vorbisfile" />
 					<Add library="jpeg" />
 					<Add library="ws2_32" />
 					<Add library="winmm" />
@@ -72,7 +72,7 @@
 					<Add library="opengl32" />
 					<Add library="enet" />
 					<Add library="OpenAL32" />
-					<Add library="..\lib\libvorbisfile.lib" />
+					<Add library="vorbisfile" />
 					<Add library="jpeg" />
 					<Add library="ws2_32" />
 					<Add library="winmm" />
diff --git a/source/lib/libvorbisfile.lib b/source/lib/vorbisfile.lib
similarity index 100%
rename from source/lib/libvorbisfile.lib
rename to source/lib/vorbisfile.lib
diff --git a/source/vcpp/cube.vcproj b/source/vcpp/cube.vcproj
index 119626b1..30c15af3 100644
--- a/source/vcpp/cube.vcproj
+++ b/source/vcpp/cube.vcproj
@@ -84,7 +84,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="enet.lib ogg.lib libvorbisfile.lib openal32.lib efx-util.lib odbc32.lib odbccp32.lib zdll.lib opengl32.lib SDL.lib SDL_image.lib ws2_32.lib winmm.lib Dbghelp.lib jpeg.lib"
+				AdditionalDependencies="enet.lib vorbisfile.lib openal32.lib zdll.lib opengl32.lib SDL.lib SDL_image.lib ws2_32.lib winmm.lib Dbghelp.lib jpeg.lib"
 				OutputFile="../../bin_win32/ac_client.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -186,7 +186,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="enet.lib ogg.lib libvorbisfile.lib openal32.lib zdll.lib opengl32.lib SDL.lib SDL_image.lib ws2_32.lib winmm.lib Dbghelp.lib jpeg.lib"
+				AdditionalDependencies="enet.lib vorbisfile.lib openal32.lib zdll.lib opengl32.lib SDL.lib SDL_image.lib ws2_32.lib winmm.lib Dbghelp.lib jpeg.lib"
 				OutputFile="../../bin_win32/ac_client.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -293,7 +293,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/PROFILE"
-				AdditionalDependencies="enet.lib ogg.lib libvorbisfile.lib openal32.lib zdll.lib opengl32.lib SDL.lib SDL_image.lib ws2_32.lib winmm.lib Dbghelp.lib jpeg.lib"
+				AdditionalDependencies="enet.lib vorbisfile.lib openal32.lib zdll.lib opengl32.lib SDL.lib SDL_image.lib ws2_32.lib winmm.lib Dbghelp.lib jpeg.lib"
 				OutputFile="..\..\bin_win32\ac_client.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -395,7 +395,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="enet.lib odbc32.lib odbccp32.lib zdll.lib opengl32.lib SDL.lib ws2_32.lib winmm.lib Dbghelp.lib"
+				AdditionalDependencies="enet.lib zdll.lib SDL.lib ws2_32.lib winmm.lib Dbghelp.lib"
 				OutputFile="../../bin_win32/ac_server.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -489,7 +489,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="enet.lib odbc32.lib odbccp32.lib zdll.lib opengl32.lib SDL.lib ws2_32.lib winmm.lib Dbghelp.lib"
+				AdditionalDependencies="enet.lib zdll.lib SDL.lib ws2_32.lib winmm.lib Dbghelp.lib"
 				OutputFile="../../bin_win32/ac_server.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"