all: Use bink2w instead of old binkw

dimhotepus · Sep 30, 2024 · 21abadc · 21abadc
1 parent cbd7727
commit 21abadc
Show file tree

Hide file tree

Showing 28 changed files with 2,873 additions and 353 deletions.
diff --git a/binkw/binkw.cc → bink2w/bink2w.cc b/binkw/binkw.cc → bink2w/bink2w.cc
@@ -7,22 +7,18 @@
 
 RADDEFSTART
 
-#ifdef __RADMAC__
-HBINK RADEXPLINK BinkMacOpen(void /*FSSpec*/* fsp, U32 flags) { return 0; }
-#endif
-
-#ifdef __RADNDS__
-RADEXPFUNC HBINK RADEXPLINK BinkNDSOpen(void /*FSFileID*/* fid, U32 flags) {
-  return 0;
-}
-#endif
+void RADEXPLINK BinkSetTimerRead(BINKTIMERREAD) {}
 
-void PTR4* RADEXPLINK BinkLogoAddress(void) { return 0; }
+void* RADEXPLINK BinkLogoAddress(void) { return 0; }
 
-void RADEXPLINK BinkSetError(const char PTR4*) {}
-char PTR4* RADEXPLINK BinkGetError(void) { return 0; }
+void RADEXPLINK BinkSetError(char const*) {}
+char* RADEXPLINK BinkGetError(void) { return 0; }
 
-HBINK RADEXPLINK BinkOpen(const char PTR4*, U32) { return 0; }
+HBINK RADEXPLINK BinkOpen(char const*, U32) { return 0; }
+HBINK RADEXPLINK BinkOpenWithOptions(char const*, BINK_OPEN_OPTIONS const*,
+                                     U32) {
+  return 0;
+}
 
 void RADEXPLINK BinkGetFrameBuffersInfo(HBINK, BINKFRAMEBUFFERS*) {}
 void RADEXPLINK BinkRegisterFrameBuffers(HBINK, BINKFRAMEBUFFERS*) {}
@@ -42,14 +38,18 @@ S32 RADEXPLINK BinkCopyToBufferRect(HBINK, void*, S32, U32, U32, U32, U32, U32,
 S32 RADEXPLINK BinkGetRects(HBINK, U32) { return 0; }
 void RADEXPLINK BinkGoto(HBINK, U32, S32) {}  // use 1 for the first frame
 U32 RADEXPLINK BinkGetKeyFrame(HBINK, U32, S32) { return 0; }
+void RADEXPLINK BinkFreeGlobals(void) {}
+S32 RADEXPLINK BinkGetPlatformInfo(S32, void*) { return 0; }
+void RADEXPLINK BinkRegisterGPUDataBuffers(HBINK, BINKGPUDATABUFFERS*) {}
+S32 RADEXPLINK BinkGetGPUDataBuffersInfo(HBINK, BINKGPUDATABUFFERS*) {
+  return 0;
+}
 
 S32 RADEXPLINK BinkSetVideoOnOff(HBINK, S32) { return 0; }
 S32 RADEXPLINK BinkSetSoundOnOff(HBINK, S32) { return 0; }
 void RADEXPLINK BinkSetVolume(HBINK, U32, S32) {}
 void RADEXPLINK BinkSetPan(HBINK, U32, S32) {}
-void RADEXPLINK BinkSetMixBins(HBINK, U32, U32 PTR4*, U32) {}
-void RADEXPLINK BinkSetMixBinVolumes(HBINK, U32, U32 PTR4*, S32 PTR4*, U32) {}
-void RADEXPLINK BinkSetWillLoop(HBINK, S32) {}
+void RADEXPLINK BinkSetSpeakerVolumes(HBINK, U32, U32*, S32*, U32) {}
 void RADEXPLINK BinkService(HBINK) {}
 
 S32 RADEXPLINK BinkShouldSkip(HBINK) { return 0; }
@@ -58,10 +58,13 @@ void RADEXPLINK BinkGetPalette(void*) {}
 
 S32 RADEXPLINK BinkControlBackgroundIO(HBINK, U32) { return 0; }
 
+void RADEXPLINK BinkSetWillLoop(HBINK, S32) {}
+
 #if defined(__RADWIN__) || defined(__RADXENON__) || defined(__RADPS3__)
 
 S32 RADEXPLINK BinkStartAsyncThread(S32, void const*) { return 0; }
 S32 RADEXPLINK BinkDoFrameAsync(HBINK, U32, U32) { return 0; }
+S32 RADEXPLINK BinkDoFrameAsyncMulti(HBINK, U32*, S32) { return 0; }
 S32 RADEXPLINK BinkDoFrameAsyncWait(HBINK, S32) { return 0; }
 S32 RADEXPLINK BinkRequestStopAsyncThread(S32) { return 0; }
 S32 RADEXPLINK BinkWaitStopAsyncThread(S32) { return 0; }
@@ -70,22 +73,25 @@ S32 RADEXPLINK BinkWaitStopAsyncThread(S32) { return 0; }
 
 HBINKTRACK RADEXPLINK BinkOpenTrack(HBINK, U32) { return 0; }
 void RADEXPLINK BinkCloseTrack(HBINKTRACK) {}
-U32 RADEXPLINK BinkGetTrackData(HBINKTRACK, void PTR4*) { return 0; }
+U32 RADEXPLINK BinkGetTrackData(HBINKTRACK, void*) { return 0; }
 
 U32 RADEXPLINK BinkGetTrackType(HBINK, U32) { return 0; }
 U32 RADEXPLINK BinkGetTrackMaxSize(HBINK, U32) { return 0; }
 U32 RADEXPLINK BinkGetTrackID(HBINK, U32) { return 0; }
 
-void RADEXPLINK BinkGetSummary(HBINK, BINKSUMMARY PTR4*) {}
-void RADEXPLINK BinkGetRealtime(HBINK, BINKREALTIME PTR4*, U32) {}
+void RADEXPLINK BinkGetSummary(HBINK, BINKSUMMARY*) {}
+void RADEXPLINK BinkGetRealtime(HBINK, BINKREALTIME*, U32) {}
 
-void RADEXPLINK BinkSetSoundTrack(U32, U32 PTR4*) {}
+void RADEXPLINK BinkSetFileOffset(U64) {}
+void RADEXPLINK BinkSetSoundTrack(U32, U32*) {}
 void RADEXPLINK BinkSetIO(BINKIOOPEN) {}
 void RADEXPLINK BinkSetFrameRate(U32, U32) {}
 void RADEXPLINK BinkSetSimulate(U32) {}
 void RADEXPLINK BinkSetIOSize(U32) {}
 
 S32 RADEXPLINK BinkSetSoundSystem(BINKSNDSYSOPEN, UINTa) { return 0; }
+S32 RADEXPLINK BinkSetSoundSystem2(BINKSNDSYSOPEN2, UINTa, UINTa) { return 0; }
+
 S32 RADEXPLINK BinkControlPlatformFeatures(S32, S32) { return 0; }
 
 #ifdef __RADWIN__
@@ -96,6 +102,9 @@ BINKSNDOPEN RADEXPLINK BinkOpenDirectSound(UINTa) { return 0; }
 BINKSNDOPEN RADEXPLINK BinkOpenWaveOut(UINTa) { return 0; }
 #endif
 
+// don't call directly
+BINKSNDOPEN RADEXPLINK BinkOpenXAudio2(UINTa param) { return 0; }
+
 #ifndef __RADMAC__
 // don't call directly
 BINKSNDOPEN RADEXPLINK BinkOpenMiles(UINTa) { return 0; }
@@ -104,6 +113,9 @@ BINKSNDOPEN RADEXPLINK BinkOpenMiles(UINTa) { return 0; }
 #ifdef __RADMAC__
 // don't call directly
 BINKSNDOPEN RADEXPLINK BinkOpenSoundManager(UINTa param) { return 0; }
+
+// don't call directly
+BINKSNDOPEN RADEXPLINK BinkOpenRADSS(UINTa param) { return 0; }
 #endif
 
 #ifdef __RADLINUX__
@@ -131,20 +143,20 @@ BINKSNDOPEN RADEXPLINK BinkOpenLibAudio(U32 param) { return 0; }
 #endif
 
 #ifdef __RADPSP__
-RADEXPFUNC BINKSNDOPEN RADEXPLINK BinkOpenPSPSound(U32 param) { return 0; }
+BINKSNDOPEN RADEXPLINK BinkOpenPSPSound(U32 param) { return 0; }
 #endif
 
 #ifdef __RADNDS__
 // don't call directly
-RADEXPFUNC BINKSNDOPEN RADEXPLINK BinkOpenNDSSound(U32 param) { return 0; }
+BINKSNDOPEN RADEXPLINK BinkOpenNDSSound(U32 param) { return 0; }
 #endif
 
 #if defined(__RADXBOX__) || defined(__RADWIN__)
-RADEXPFUNC S32 RADEXPLINK BinkDX8SurfaceType(void*) { return 0; }
+S32 RADEXPLINK BinkDX8SurfaceType(void*) { return 0; }
 #endif
 
 #if defined(__RADXENON__) || defined(__RADWIN__)
-RADEXPFUNC S32 RADEXPLINK BinkDX9SurfaceType(void*) { return 0; }
+S32 RADEXPLINK BinkDX9SurfaceType(void*) { return 0; }
 #endif
 
 // The BinkBuffer API isn't implemented on DOS, or any of the consoles
@@ -157,66 +169,47 @@ RADEXPFUNC S32 RADEXPLINK BinkDX9SurfaceType(void*) { return 0; }
 // #include <palettes.h>
 // #include <qdoffscreen.h>
 
-RADEXPFUNC HBINKBUFFER RADEXPLINK BinkBufferOpen(void* /*WindowPtr*/ wnd,
-                                                 U32 width, U32 height,
-                                                 U32 bufferflags) {
+HBINKBUFFER RADEXPLINK BinkBufferOpen(void* /*WindowPtr*/ wnd, U32 width,
+                                      U32 height, U32 bufferflags) {
   return 0;
 }
-RADEXPFUNC S32 RADEXPLINK BinkGDSurfaceType(void* /*GDHandle*/ gd) {
-  return 0;
-};
-RADEXPFUNC S32 RADEXPLINK BinkIsSoftwareCursor(void* /*GDHandle*/ gd) {
-  return 0;
-}
-RADEXPFUNC S32 RADEXPLINK BinkCheckCursor(void* /*WindowPtr*/ wp, S32 x, S32 y,
-                                          S32 w, S32 h) {
+S32 RADEXPLINK BinkGDSurfaceType(void* /*GDHandle*/ gd) { return 0; };
+S32 RADEXPLINK BinkIsSoftwareCursor(void* /*GDHandle*/ gd) { return 0; }
+S32 RADEXPLINK BinkCheckCursor(void* /*WindowPtr*/ wp, S32 x, S32 y, S32 w,
+                               S32 h) {
   return 0;
 }
 
 #else
 
-RADEXPFUNC HBINKBUFFER RADEXPLINK BinkBufferOpen(void* /*HWND*/, U32, U32,
-                                                 U32) {
-  return 0;
-}
-RADEXPFUNC S32 RADEXPLINK BinkBufferSetHWND(HBINKBUFFER, void* /*HWND*/) {
-  return 0;
-}
-RADEXPFUNC S32 RADEXPLINK BinkDDSurfaceType(void PTR4*) { return 0; }
-RADEXPFUNC S32 RADEXPLINK BinkIsSoftwareCursor(void PTR4*, void* /*HCURSOR*/) {
-  return 0;
-}
-RADEXPFUNC S32 RADEXPLINK BinkCheckCursor(void* /*HWND*/, S32, S32, S32, S32) {
-  return 0;
-}
-RADEXPFUNC S32 RADEXPLINK BinkBufferSetDirectDraw(void PTR4*, void PTR4*) {
+HBINKBUFFER RADEXPLINK BinkBufferOpen(void* /*HWND*/, U32, U32, U32) {
   return 0;
 }
+S32 RADEXPLINK BinkBufferSetHWND(HBINKBUFFER, void* /*HWND*/) { return 0; }
+S32 RADEXPLINK BinkDDSurfaceType(void*) { return 0; }
+S32 RADEXPLINK BinkIsSoftwareCursor(void*, void* /*HCURSOR*/) { return 0; }
+S32 RADEXPLINK BinkCheckCursor(void* /*HWND*/, S32, S32, S32, S32) { return 0; }
+S32 RADEXPLINK BinkBufferSetDirectDraw(void*, void*) { return 0; }
 
 #endif
 
-RADEXPFUNC void RADEXPLINK BinkBufferClose(HBINKBUFFER) {}
-RADEXPFUNC S32 RADEXPLINK BinkBufferLock(HBINKBUFFER) { return 0; }
-RADEXPFUNC S32 RADEXPLINK BinkBufferUnlock(HBINKBUFFER) { return 0; };
-RADEXPFUNC void RADEXPLINK BinkBufferSetResolution(S32, S32, S32) {}
-RADEXPFUNC void RADEXPLINK BinkBufferCheckWinPos(HBINKBUFFER, S32 PTR4*,
-                                                 S32 PTR4*) {}
-RADEXPFUNC S32 RADEXPLINK BinkBufferSetOffset(HBINKBUFFER, S32, S32) {
-  return 0;
-}
-RADEXPFUNC void RADEXPLINK BinkBufferBlit(HBINKBUFFER, BINKRECT PTR4*, U32) {}
-RADEXPFUNC S32 RADEXPLINK BinkBufferSetScale(HBINKBUFFER, U32, U32) {
-  return 0;
-}
-RADEXPFUNC char PTR4* RADEXPLINK BinkBufferGetDescription(HBINKBUFFER) {
-  return 0;
-}
-RADEXPFUNC char PTR4* RADEXPLINK BinkBufferGetError() { return 0; }
-RADEXPFUNC void RADEXPLINK BinkRestoreCursor(S32) {}
-RADEXPFUNC S32 RADEXPLINK BinkBufferClear(HBINKBUFFER, U32) { return 0; }
+void RADEXPLINK BinkBufferClose(HBINKBUFFER) {}
+S32 RADEXPLINK BinkBufferLock(HBINKBUFFER) { return 0; }
+S32 RADEXPLINK BinkBufferUnlock(HBINKBUFFER) { return 0; };
+void RADEXPLINK BinkBufferSetResolution(S32, S32, S32) {}
+void RADEXPLINK BinkBufferCheckWinPos(HBINKBUFFER, S32*, S32*) {}
+S32 RADEXPLINK BinkBufferSetOffset(HBINKBUFFER, S32, S32) { return 0; }
+void RADEXPLINK BinkBufferBlit(HBINKBUFFER, BINKRECT*, U32) {}
+S32 RADEXPLINK BinkBufferSetScale(HBINKBUFFER, U32, U32) { return 0; }
+char* RADEXPLINK BinkBufferGetDescription(HBINKBUFFER) { return 0; }
+char* RADEXPLINK BinkBufferGetError() { return 0; }
+void RADEXPLINK BinkRestoreCursor(S32) {}
+S32 RADEXPLINK BinkBufferClear(HBINKBUFFER, U32) { return 0; }
 
 #endif
 
-RADEXPFUNC void RADEXPLINK BinkSetMemory(BINKMEMALLOC, BINKMEMFREE) {}
+void RADEXPLINK BinkSetMemory(BINKMEMALLOC, BINKMEMFREE) {}
+void RADEXPLINK BinkUseTelemetry(void*) {}
+void RADEXPLINK BinkUseTmLite(void*) {}
 
 RADDEFEND
diff --git a/binkw/binkw.vcxproj → bink2w/bink2w.vcxproj b/binkw/binkw.vcxproj → bink2w/bink2w.vcxproj
@@ -22,8 +22,9 @@
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{EE6560A5-C47E-4FB0-A93C-01A5518EA97A}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>binkw</RootNamespace>
+    <RootNamespace>bink2w</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectName>bink2w</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -72,25 +73,25 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <TargetName>binkw$(PlatformArchitecture)</TargetName>
+    <TargetName>bink2w$(PlatformArchitecture)</TargetName>
     <OutDir>$(SolutionDir)out\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)out\$(ProjectName)\$(Platform)\$(Configuration)\int\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <TargetName>binkw$(PlatformArchitecture)</TargetName>
+    <TargetName>bink2w$(PlatformArchitecture)</TargetName>
     <OutDir>$(SolutionDir)out\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)out\$(ProjectName)\$(Platform)\$(Configuration)\int\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <TargetName>binkw$(PlatformArchitecture)</TargetName>
+    <TargetName>bink2w$(PlatformArchitecture)</TargetName>
     <OutDir>$(SolutionDir)out\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)out\$(ProjectName)\$(Platform)\$(Configuration)\int\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <TargetName>binkw$(PlatformArchitecture)</TargetName>
+    <TargetName>bink2w$(PlatformArchitecture)</TargetName>
     <OutDir>$(SolutionDir)out\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)out\$(ProjectName)\$(Platform)\$(Configuration)\int\</IntDir>
   </PropertyGroup>
@@ -112,8 +113,8 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
-      <ImportLibrary>D:\github\bink_media_player\deps\bink\binkw$(PlatformArchitecture).lib</ImportLibrary>
-      <OutputFile>$(OutDir)binkw$(PlatformArchitecture)$(TargetExt)</OutputFile>
+      <ImportLibrary>$(SolutionDir)deps\bink\bink2w$(PlatformArchitecture).lib</ImportLibrary>
+      <OutputFile>$(OutDir)bink2w$(PlatformArchitecture)$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -134,8 +135,8 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
-      <ImportLibrary>D:\github\bink_media_player\deps\bink\binkw$(PlatformArchitecture).lib</ImportLibrary>
-      <OutputFile>$(OutDir)binkw$(PlatformArchitecture)$(TargetExt)</OutputFile>
+      <ImportLibrary>$(SolutionDir)deps\bink\bink2w$(PlatformArchitecture).lib</ImportLibrary>
+      <OutputFile>$(OutDir)bink2w$(PlatformArchitecture)$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -160,8 +161,8 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
-      <ImportLibrary>D:\github\bink_media_player\deps\bink\binkw$(PlatformArchitecture).lib</ImportLibrary>
-      <OutputFile>$(OutDir)binkw$(PlatformArchitecture)$(TargetExt)</OutputFile>
+      <ImportLibrary>$(SolutionDir)deps\bink\bink2w$(PlatformArchitecture).lib</ImportLibrary>
+      <OutputFile>$(OutDir)bink2w$(PlatformArchitecture)$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -186,16 +187,16 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
-      <ImportLibrary>D:\github\bink_media_player\deps\bink\binkw$(PlatformArchitecture).lib</ImportLibrary>
-      <OutputFile>$(OutDir)binkw$(PlatformArchitecture)$(TargetExt)</OutputFile>
+      <ImportLibrary>$(SolutionDir)deps\bink\bink2w$(PlatformArchitecture).lib</ImportLibrary>
+      <OutputFile>$(OutDir)bink2w$(PlatformArchitecture)$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="binkw.cc" />
+    <ClCompile Include="bink2w.cc" />
     <ClCompile Include="dllmain.cc" />
     <ClCompile Include="stdafx.cc">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>

diff --git a/binkw/binkw.vcxproj.filters → bink2w/bink2w.vcxproj.filters b/binkw/binkw.vcxproj.filters → bink2w/bink2w.vcxproj.filters
@@ -26,10 +26,10 @@
     <ClCompile Include="dllmain.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="binkw.cc">
+    <ClCompile Include="stdafx.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="stdafx.cc">
+    <ClCompile Include="bink2w.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>

diff --git a/binkw/dllmain.cc → bink2w/dllmain.cc b/binkw/dllmain.cc → bink2w/dllmain.cc
diff --git a/binkw/stdafx.cc → bink2w/stdafx.cc b/binkw/stdafx.cc → bink2w/stdafx.cc
diff --git a/binkw/stdafx.h → bink2w/stdafx.h b/binkw/stdafx.h → bink2w/stdafx.h
diff --git a/binkw/targetver.h → bink2w/targetver.h b/binkw/targetver.h → bink2w/targetver.h
diff --git a/bink_media_player.sln b/bink_media_player.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 17.4.33103.184
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bink_media_player", "bink_media_player\bink_media_player.vcxproj", "{17B3BB3B-99F0-49F0-94AC-786D84B01EE8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "binkw", "binkw\binkw.vcxproj", "{EE6560A5-C47E-4FB0-A93C-01A5518EA97A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mss", "mss\mss.vcxproj", "{00DE7933-D26F-48E8-ADAA-11B71244A7EF}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "binkmp", "binkmp\binkmp.vcxproj", "{DB42E9B0-6512-43AE-8777-36A81CA51096}"
@@ -21,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		THIRD_PARTY = THIRD_PARTY
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bink2w", "bink2w\bink2w.vcxproj", "{EE6560A5-C47E-4FB0-A93C-01A5518EA97A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -37,14 +37,6 @@ Global
 		{17B3BB3B-99F0-49F0-94AC-786D84B01EE8}.Release|x64.Build.0 = Release|x64
 		{17B3BB3B-99F0-49F0-94AC-786D84B01EE8}.Release|x86.ActiveCfg = Release|Win32
 		{17B3BB3B-99F0-49F0-94AC-786D84B01EE8}.Release|x86.Build.0 = Release|Win32
-		{EE6560A5-C47E-4FB0-A93C-01A5518EA97A}.Debug|x64.ActiveCfg = Debug|x64
-		{EE6560A5-C47E-4FB0-A93C-01A5518EA97A}.Debug|x64.Build.0 = Debug|x64
-		{EE6560A5-C47E-4FB0-A93C-01A5518EA97A}.Debug|x86.ActiveCfg = Debug|Win32
-		{EE6560A5-C47E-4FB0-A93C-01A5518EA97A}.Debug|x86.Build.0 = Debug|Win32
-		{EE6560A5-C47E-4FB0-A93C-01A5518EA97A}.Release|x64.ActiveCfg = Release|x64
-		{EE6560A5-C47E-4FB0-A93C-01A5518EA97A}.Release|x64.Build.0 = Release|x64
-		{EE6560A5-C47E-4FB0-A93C-01A5518EA97A}.Release|x86.ActiveCfg = Release|Win32
-		{EE6560A5-C47E-4FB0-A93C-01A5518EA97A}.Release|x86.Build.0 = Release|Win32
 		{00DE7933-D26F-48E8-ADAA-11B71244A7EF}.Debug|x64.ActiveCfg = Debug|x64
 		{00DE7933-D26F-48E8-ADAA-11B71244A7EF}.Debug|x64.Build.0 = Debug|x64
 		{00DE7933-D26F-48E8-ADAA-11B71244A7EF}.Debug|x86.ActiveCfg = Debug|Win32
@@ -61,6 +53,14 @@ Global
 		{DB42E9B0-6512-43AE-8777-36A81CA51096}.Release|x64.Build.0 = Release|x64
 		{DB42E9B0-6512-43AE-8777-36A81CA51096}.Release|x86.ActiveCfg = Release|Win32
 		{DB42E9B0-6512-43AE-8777-36A81CA51096}.Release|x86.Build.0 = Release|Win32
+		{EE6560A5-C47E-4FB0-A93C-01A5518EA97A}.Debug|x64.ActiveCfg = Debug|x64
+		{EE6560A5-C47E-4FB0-A93C-01A5518EA97A}.Debug|x64.Build.0 = Debug|x64
+		{EE6560A5-C47E-4FB0-A93C-01A5518EA97A}.Debug|x86.ActiveCfg = Debug|Win32
+		{EE6560A5-C47E-4FB0-A93C-01A5518EA97A}.Debug|x86.Build.0 = Debug|Win32
+		{EE6560A5-C47E-4FB0-A93C-01A5518EA97A}.Release|x64.ActiveCfg = Release|x64
+		{EE6560A5-C47E-4FB0-A93C-01A5518EA97A}.Release|x64.Build.0 = Release|x64
+		{EE6560A5-C47E-4FB0-A93C-01A5518EA97A}.Release|x86.ActiveCfg = Release|Win32
+		{EE6560A5-C47E-4FB0-A93C-01A5518EA97A}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE