From 5878ba94fd1005cace56b9c28db5b4bde995be58 Mon Sep 17 00:00:00 2001
From: Brian Matzon <brian@matzon.dk>
Date: Sun, 23 May 2004 13:49:26 +0000
Subject: [PATCH] fmod included

---
 platform_build/win32_vs_net/lwjgl-fmod.vcproj | 145 ++++++++++++++++++
 platform_build/win32_vs_net/lwjgl.sln         |   8 +
 platform_build/win32_vs_net/lwjgl.suo         | Bin 11264 -> 10752 bytes
 platform_build/win32_vs_net/lwjgl.vcproj      |  15 +-
 4 files changed, 164 insertions(+), 4 deletions(-)
 create mode 100644 platform_build/win32_vs_net/lwjgl-fmod.vcproj

diff --git a/platform_build/win32_vs_net/lwjgl-fmod.vcproj b/platform_build/win32_vs_net/lwjgl-fmod.vcproj
new file mode 100644
index 00000000..c2532949
--- /dev/null
+++ b/platform_build/win32_vs_net/lwjgl-fmod.vcproj
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="lwjgl-fmod"
+	ProjectGUID="{E70435A1-9D52-4ECD-8839-C4FF5C23270E}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;C:\Program Files\fmodapi372win\api\inc&quot;;C:\Java\j2sdk1.5.0\include;C:\Java\j2sdk1.5.0\include\win32"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/lwjgl-fmod.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/lwjgl-fmod.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				GlobalOptimizations="TRUE"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="&quot;C:\Program Files\fmodapi372win\api\inc&quot;;C:\Java\j2sdk1.5.0\include;C:\Java\j2sdk1.5.0\include\win32"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				ExceptionHandling="FALSE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="0"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="TRUE"
+				OutputFile="..\..\libs\win32\lwjgl-fmod.dll"
+				LinkIncremental="1"
+				GenerateDebugInformation="FALSE"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary=""
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\..\src\native\common\common_tools.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\native\common\fmod\extfmod.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\native\common\fmod\org_lwjgl_fmod_FMOD.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\native\common\fmod\org_lwjgl_fmod_FMusic.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\native\common\fmod\org_lwjgl_fmod_FSound.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/platform_build/win32_vs_net/lwjgl.sln b/platform_build/win32_vs_net/lwjgl.sln
index e4285ec7..4cf4abc3 100644
--- a/platform_build/win32_vs_net/lwjgl.sln
+++ b/platform_build/win32_vs_net/lwjgl.sln
@@ -3,6 +3,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lwjgl", "lwjgl.vcproj", "{F
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lwjgl-fmod", "lwjgl-fmod.vcproj", "{E70435A1-9D52-4ECD-8839-C4FF5C23270E}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -13,6 +17,10 @@ Global
 		{F94B1F23-4B6C-4AC6-9C90-E37CBA7F0E62}.Debug.Build.0 = Debug|Win32
 		{F94B1F23-4B6C-4AC6-9C90-E37CBA7F0E62}.Release.ActiveCfg = Release|Win32
 		{F94B1F23-4B6C-4AC6-9C90-E37CBA7F0E62}.Release.Build.0 = Release|Win32
+		{E70435A1-9D52-4ECD-8839-C4FF5C23270E}.Debug.ActiveCfg = Debug|Win32
+		{E70435A1-9D52-4ECD-8839-C4FF5C23270E}.Debug.Build.0 = Debug|Win32
+		{E70435A1-9D52-4ECD-8839-C4FF5C23270E}.Release.ActiveCfg = Release|Win32
+		{E70435A1-9D52-4ECD-8839-C4FF5C23270E}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/platform_build/win32_vs_net/lwjgl.suo b/platform_build/win32_vs_net/lwjgl.suo
index 0637e62bc75b91de2d668006998a62df40667144..6b71d411cc0d8ddcc245a887f0cc6cba8c4cd3f5 100644
GIT binary patch
delta 1243
zcmb_c%}*0i5TCbfq1LUk&=%yQAK_Dzno>ZDfD~vUK?oAiVC+GW3K9eaROGWJ9z2=A
zTsV63D9|GpFeDm7O!*V^WMblp0~iH=uXYUwyfK^KzIikA=FQh`tS{EP+M$TUweELf
z>8`r0c8FZ|sIGH~vd=3!!EKR7M4NV=QQNf(V9x_bAlA+0ysswAnTB9jE#_FJ%KN5X
z?GP3QxG%j}RPlUzV_y)q6+kUusH?$W0cwB%a203*>VSHn0k{S<0>+u<6d%Ic1+Xon
zO78*F3)}>50f$T7Z`aMQg&5~A4i_(8(pYmg^RF`>tU^F96H8`-z~g(CgsNFn5<_ar
zhCt=r;_FDvb__xGscKq;49|JpCRl<7lJ8u4uSOM%bnj6}-X&@E&W89H*+|}<uKtzf
zidiJ<r&f7hYR0fG0DkV)vrRIf67JM<IHvC_8N@SL3qs|CtVP9b;+gD)j90J#@s_)c
zOKsDliP!Wl{$X?4o9P}+(R~`CW*R|YE!a)-Z+E_EOxe^Yxte81qe$bRV+Ap+P?)ze
zi`H|t1&1s?lLx+k#t(8oDLD?XBlL`hX%MTI9?&C1JHUzj0?TvFP%am2YcdxdFv`e#
z1vfN11j=#YRAI0A>@k5=HW&LOP4ZFU?UH|&&}DjxRK{rnR}RBM))cW~SRyR6Cf;-g
zx!>-;cw*A9Z6GtrutF52etJTK{MfV96UNZ_sER778eOPBQnj$CMnAlehEcK*xB#9?
zXuQ~0Q7fKmaDK@A$@5{FM|=Y)O%F}6Uhc)1*?7lY&?!fD7Jg3U7XEGvx1E-+El(YP
zbNl$K-D#PpWJeJyYpwvhoq@Lh7akc=9ugfx5hu`+D7jIPhnR>cO-f~oM&UEUM~)Zq
zV3Apv<?tBe;0j|iB4<IaCrp%X_6i3#St`?8q=kYHust3snN#Ff$1ii{;=$54!X2e)
XjC5)Y(SafSF2*n;Q5wY$!%BYu;R-4-

delta 1745
zcmcIkTS!z<6y4`KGtP{6CdZjZ!{_*D5*l&Fv8=@BXds3TS!reuOnUi3qrfx=AqWCN
zH$<QP^c9sg&{tHDK?H{VMIRA;hxK8gB-uK*xiuq{6?G2l-hK8tXP>+GTIWXEBJDHH
ziqS<xU!q~<vk)olG34538s7EXS$QIoFcC@T5kr%@inakm`DTZC3ojYw%?{o1(oo2e
zR0A&=+td~~gFqL+?WRJpi^ojW<zKMT57$mW+7jikw*lLM3SbAY7m#z6@;wzUU{`X`
zCmn5Y>;v`#2Y_~<12_nD0*3%C@KpH9J@cgC{i>Zmx>NaZUOvCDe6mpnR>+hPY?blJ
z(M9XLK{duay4U1{!!9^n)P$T|ai|eJ99EsNp!Or@=`@|7UYtBkLu4c&u=6-TIO<YT
zk7AW)ZB|J7Wt-`o6VDFKY3odeZ@!?oK(!R0MkBsWoB8HP@xl(LMIUG*jyRT-Tmz4!
zT@>xSoHnk!Qh3C9QS|Y$^M<JAyN(uKaOJSoQ^@xnO?*4I%Ap0P1{67nr=NUm&fh-m
zt`-W{xUVHmQiGn97>=&Gp9*y&4s`>1MT{N{Leb@n=ZZ~**-Np^`E_QN5Ri;>I%`%<
zjcw7l@nTl1rW++L7N5;-Guz@EDUvgcWn+=k!L#mEsVlNmHw{o9`T+H_P<Qj=oEmja
zA{ALQN|m&SPJx4NYQ(#jdSF+<pTL$afh~Si>>2N-lUUnLXFxzRtReIPpalL=^a~WC
zQmtmSR8IAfs*mcZ4E7FKvYJ6zPmJm?R|=~PeVaBP0HyVStbTyTkdHr*APcXu`<J@d
ztm`5^V;m%DEW=TL^pLF6clsdo3^B&5PA|`RO8KoL@3*wz;|X^izt1$Mm(V#>V^FKY
zX+)N?y_yhTUZfIk%~5$F)5H_`E=|PIssgJp%hfvdrUndp73~g%iXQOMqEK|UXhrbj
z;ymB4%3cWq20=wX2(*!P9SXha$3VBFYt25cwN&t?eDB|@!#l2r{`X2q(7~3U{2nY?
zX%*TkxYgC1J^JI;A>nwQ*3-G3iDY*0zvz0Mn^27lu%^x345oc}c<YT+Ok4pj@9Ijq
QUfGo*rKJBK{~-V5uiHYJGynhq

diff --git a/platform_build/win32_vs_net/lwjgl.vcproj b/platform_build/win32_vs_net/lwjgl.vcproj
index e20b2530..94972f64 100644
--- a/platform_build/win32_vs_net/lwjgl.vcproj
+++ b/platform_build/win32_vs_net/lwjgl.vcproj
@@ -99,7 +99,8 @@
 				AdditionalDependencies="dinput.lib dxguid.lib OpenAL32.lib alut.lib eaxguid.lib OpenGL32.Lib Version.lib"
 				OutputFile="..\..\libs\win32\lwjgl.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\Creative Labs\OpenAL 1.0 SDK\libs&quot;;&quot;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\Include\prerelease&quot;;&quot;C:\Program Files\Creative Labs\EAX 2.0 Extensions SDK\Libs&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\Creative Labs\OpenAL 1.0 SDK\libs&quot;;&quot;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\Include\prerelease&quot;;&quot;C:\Program Files\Creative Labs\EAX 2.0 Extensions SDK\Libs&quot;;&quot;C:\Program Files\fmodapi372win\api\lib&quot;"
+				IgnoreAllDefaultLibraries="FALSE"
 				GenerateDebugInformation="FALSE"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -207,6 +208,9 @@
 			<File
 				RelativePath="..\..\src\native\win32\org_lwjgl_opengl_Pbuffer.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\native\win32\org_lwjgl_opengl_SWTCanvas.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\native\win32\org_lwjgl_opengl_Window.cpp">
 			</File>
@@ -220,6 +224,9 @@
 			<Filter
 				Name="arb"
 				Filter="">
+				<File
+					RelativePath="..\..\src\native\common\arb\org_lwjgl_opengl_ARBBufferObject.cpp">
+				</File>
 				<File
 					RelativePath="..\..\src\native\common\arb\org_lwjgl_opengl_ARBImaging.cpp">
 				</File>
@@ -253,9 +260,6 @@
 				<File
 					RelativePath="..\..\src\native\common\arb\org_lwjgl_opengl_ARBVertexBlend.cpp">
 				</File>
-				<File
-					RelativePath="..\..\src\native\common\arb\org_lwjgl_opengl_ARBVertexBufferObject.cpp">
-				</File>
 				<File
 					RelativePath="..\..\src\native\common\arb\org_lwjgl_opengl_ARBVertexProgram.cpp">
 				</File>
@@ -309,6 +313,9 @@
 				<File
 					RelativePath="..\..\src\native\common\ext\org_lwjgl_opengl_EXTCompiledVertexArray.cpp">
 				</File>
+				<File
+					RelativePath="..\..\src\native\common\ext\org_lwjgl_opengl_EXTDepthBoundsTest.cpp">
+				</File>
 				<File
 					RelativePath="..\..\src\native\common\ext\org_lwjgl_opengl_EXTDrawRangeElements.cpp">
 				</File>