From 6980a08090895e297c749a35a98f10324227f7c9 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Sun, 29 Jun 2025 17:46:19 +1000
Subject: [PATCH] Fix Visual Studio project and fix sounds not working properly
 on Symbian

---
 misc/symbian/ClassiCube_common.mmh |   2 +-
 src/Audio_Symbian.cpp              |   2 +-
 src/ClassiCube.vcxproj             |  68 +---------
 src/ClassiCube.vcxproj.filters     | 204 +++--------------------------
 src/EnvRenderer.c                  |   1 -
 5 files changed, 24 insertions(+), 253 deletions(-)

diff --git a/misc/symbian/ClassiCube_common.mmh b/misc/symbian/ClassiCube_common.mmh
index 1fe351756..f9b1c161f 100644
--- a/misc/symbian/ClassiCube_common.mmh
+++ b/misc/symbian/ClassiCube_common.mmh
@@ -47,7 +47,7 @@ SOURCEPATH ../../src
 SOURCE Animations.c Audio.c Audio_Null.c AxisLinesRenderer.c Bitmap.c Block.c BlockPhysics.c Builder.c Camera.c Certs.c Chat.c Commands.c Deflate.c Drawer.c Drawer2D.c Entity.c EntityComponents.c EntityRenderers.c EnvRenderer.c Event.c ExtMath.c FancyLighting.c Formats.c Game.c GameVersion.c Generator.c Graphics_GL1.c Graphics_SoftGPU.c Gui.c HeldBlockRenderer.c Http_Web.c Http_Worker.c Input.c InputHandler.c Inventory.c IsometricDrawer.c LBackend.c LScreens.c LWeb.c LWidgets.c Launcher.c Lighting.c Logger.c MapRenderer.c MenuOptions.c Menus.c Model.c Options.c PackedCol.c Particle.c Physics.c Picking.c Platform_Posix.c Protocol.c Queue.c Resources.c SSL.c Screens.c SelOutlineRenderer.c SelectionBox.c Server.c Stream.c String.c SystemFonts.c TexturePack.c TouchUI.c Utils.c Vectors.c Widgets.c World.c _autofit.c _cff.c _ftbase.c _ftbitmap.c _ftglyph.c _ftinit.c _ftsynth.c _psaux.c _pshinter.c _psmodule.c _sfnt.c _smooth.c _truetype.c _type1.c Vorbis.c Platform_Symbian.cpp Graphics_GL2.c Window_Symbian.cpp Audio_Symbian.cpp
 
 SOURCEPATH ../../third_party/bearssl/src
-SOURCE aes_big_cbcdec.c aes_big_cbcenc.c aes_big_ctr.c aes_big_ctrcbc.c aes_big_dec.c aes_big_enc.c aes_common.c aes_ct64.c aes_ct64_cbcdec.c aes_ct64_cbcenc.c aes_ct64_ctr.c aes_ct64_ctrcbc.c aes_ct64_dec.c aes_ct64_enc.c aes_ct.c aes_ct_cbcdec.c aes_ct_cbcenc.c aes_ct_ctr.c aes_ct_ctrcbc.c aes_ct_dec.c aes_ct_enc.c aesctr_drbg.c aes_small_cbcdec.c aes_small_cbcenc.c aes_small_ctr.c aes_small_ctrcbc.c aes_small_dec.c aes_small_enc.c aes_x86ni.c aes_x86ni_cbcdec.c aes_x86ni_cbcenc.c aes_x86ni_ctr.c aes_x86ni_ctrcbc.c asn1enc.c ccm.c ccopy.c chacha20_ct.c chacha20_sse2.c dec32be.c dec32le.c dec64be.c dec64le.c dig_oid.c dig_size.c ec_all_m31.c ec_c25519_i31.c ec_c25519_m31.c ec_c25519_m62.c ec_c25519_m64.c ec_curve25519.c ec_default.c ecdsa_atr.c ecdsa_default_vrfy_asn1.c ecdsa_default_vrfy_raw.c ecdsa_i31_bits.c ecdsa_i31_vrfy_asn1.c ecdsa_i31_vrfy_raw.c ec_p256_m31.c ec_p256_m62.c ec_p256_m64.c ec_prime_i31.c ec_secp256r1.c ec_secp384r1.c ec_secp521r1.c enc32be.c enc32le.c enc64be.c enc64le.c gcm.c ghash_ctmul64.c ghash_ctmul.c ghash_pclmul.c hmac.c hmac_ct.c hmac_drbg.c i31_add.c i31_bitlen.c i31_decmod.c i31_decode.c i31_decred.c i31_encode.c i31_fmont.c i31_iszero.c i31_moddiv.c i31_modpow2.c i31_modpow.c i31_montmul.c i31_mulacc.c i31_muladd.c i31_ninv31.c i31_reduce.c i31_rshift.c i31_sub.c i31_tmont.c i32_div32.c i62_modpow2.c md5.c md5sha1.c multihash.c poly1305_ctmul.c poly1305_ctmulq.c prf.c prf_md5sha1.c prf_sha256.c prf_sha384.c rsa_default_pkcs1_vrfy.c rsa_default_priv.c rsa_default_pub.c rsa_i31_pkcs1_vrfy.c rsa_i31_priv.c rsa_i31_pub.c rsa_i62_pkcs1_vrfy.c rsa_i62_priv.c rsa_i62_pub.c rsa_pkcs1_sig_unpad.c sha1.c sha2big.c sha2small.c ssl_client.c ssl_client_default_rsapub.c ssl_client_full.c ssl_engine.c ssl_engine_default_aescbc.c ssl_engine_default_aesccm.c ssl_engine_default_aesgcm.c ssl_engine_default_chapol.c ssl_engine_default_ec.c ssl_engine_default_ecdsa.c ssl_engine_default_rsavrfy.c ssl_hashes.c ssl_hs_client.c ssl_io.c ssl_rec_cbc.c ssl_rec_ccm.c ssl_rec_chapol.c ssl_rec_gcm.c x509_minimal.c x509_minimal_full.c
+SOURCE aes_big_cbcdec.c aes_big_cbcenc.c aes_big_ctr.c aes_big_ctrcbc.c aes_big_dec.c aes_big_enc.c aes_common.c aesctr_drbg.c aes_x86ni.c aes_x86ni_cbcdec.c aes_x86ni_cbcenc.c aes_x86ni_ctr.c aes_x86ni_ctrcbc.c asn1enc.c ccm.c ccopy.c chacha20_ct.c chacha20_sse2.c dec32be.c dec32le.c dec64be.c dec64le.c dig_oid.c dig_size.c ec_all_m31.c ec_c25519_i31.c ec_c25519_m31.c ec_c25519_m62.c ec_c25519_m64.c ec_curve25519.c ec_default.c ecdsa_atr.c ecdsa_default_vrfy_asn1.c ecdsa_default_vrfy_raw.c ecdsa_i31_bits.c ecdsa_i31_vrfy_asn1.c ecdsa_i31_vrfy_raw.c ec_p256_m31.c ec_p256_m62.c ec_p256_m64.c ec_prime_i31.c ec_secp256r1.c ec_secp384r1.c ec_secp521r1.c enc32be.c enc32le.c enc64be.c enc64le.c gcm.c ghash_ctmul64.c ghash_ctmul.c ghash_pclmul.c hmac.c hmac_ct.c hmac_drbg.c i31_add.c i31_bitlen.c i31_decmod.c i31_decode.c i31_decred.c i31_encode.c i31_fmont.c i31_iszero.c i31_moddiv.c i31_modpow2.c i31_modpow.c i31_montmul.c i31_mulacc.c i31_muladd.c i31_ninv31.c i31_reduce.c i31_rshift.c i31_sub.c i31_tmont.c i32_div32.c i62_modpow2.c md5.c md5sha1.c multihash.c poly1305_ctmul.c poly1305_ctmulq.c prf.c prf_md5sha1.c prf_sha256.c prf_sha384.c rsa_default_pkcs1_vrfy.c rsa_default_priv.c rsa_default_pub.c rsa_i31_pkcs1_vrfy.c rsa_i31_priv.c rsa_i31_pub.c rsa_i62_pkcs1_vrfy.c rsa_i62_priv.c rsa_i62_pub.c rsa_pkcs1_sig_unpad.c sha1.c sha2big.c sha2small.c ssl_client.c ssl_client_default_rsapub.c ssl_client_full.c ssl_engine.c ssl_engine_default_aescbc.c ssl_engine_default_aesccm.c ssl_engine_default_aesgcm.c ssl_engine_default_chapol.c ssl_engine_default_ec.c ssl_engine_default_ecdsa.c ssl_engine_default_rsavrfy.c ssl_hashes.c ssl_hs_client.c ssl_io.c ssl_rec_cbc.c ssl_rec_ccm.c ssl_rec_chapol.c ssl_rec_gcm.c x509_minimal.c x509_minimal_full.c
 
 CAPABILITY NetworkServices ReadUserData UserEnvironment WriteUserData
 
diff --git a/src/Audio_Symbian.cpp b/src/Audio_Symbian.cpp
index 995846191..42d342aa8 100644
--- a/src/Audio_Symbian.cpp
+++ b/src/Audio_Symbian.cpp
@@ -392,7 +392,7 @@ cc_result SoundContext_PlayData(struct AudioContext* ctx, struct AudioData* data
 }
 
 cc_result SoundContext_PollBusy(struct AudioContext* ctx, cc_bool* isBusy) {
-	*isBusy = !&ctx->bufs[0].available;
+	*isBusy = !ctx->bufs[0].available;
 	return 0;
 }
 
diff --git a/src/ClassiCube.vcxproj b/src/ClassiCube.vcxproj
index 384376b88..3ea71e143 100644
--- a/src/ClassiCube.vcxproj
+++ b/src/ClassiCube.vcxproj
@@ -402,6 +402,8 @@
     <ClInclude Include="LScreens.h" />
     <ClInclude Include="LWeb.h" />
     <ClInclude Include="LWidgets.h" />
+    <ClInclude Include="main.h" />
+    <ClInclude Include="main_impl.h" />
     <ClInclude Include="Model.h" />
     <ClInclude Include="Input.h" />
     <ClInclude Include="Menus.h" />
@@ -441,6 +443,7 @@
     <ClInclude Include="Widgets.h" />
     <ClInclude Include="Window.h" />
     <ClInclude Include="World.h" />
+    <ClInclude Include="_AudioBase.h" />
     <ClInclude Include="_GLShared.h" />
     <ClInclude Include="_GraphicsBase.h" />
     <ClInclude Include="_HttpBase.h" />
@@ -450,17 +453,15 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Animations.c" />
+    <ClCompile Include="Audio_OpenAL.c" />
+    <ClCompile Include="Audio_WinMM.c" />
     <ClCompile Include="Commands.c" />
     <ClCompile Include="EntityRenderers.c" />
     <ClCompile Include="GameVersion.c" />
-    <ClCompile Include="Graphics_3DS.c" />
     <ClCompile Include="Graphics_D3D11.c" />
     <ClCompile Include="Graphics_D3D9.c" />
-    <ClCompile Include="Graphics_Dreamcast.c" />
-    <ClCompile Include="Graphics_GCWii.c" />
     <ClCompile Include="Graphics_GL1.c" />
     <ClCompile Include="Audio.c" />
-    <ClCompile Include="AudioBackend.c" />
     <ClCompile Include="Camera.c" />
     <ClCompile Include="AxisLinesRenderer.c" />
     <ClCompile Include="Block.c" />
@@ -476,17 +477,7 @@
     <ClCompile Include="Formats.c" />
     <ClCompile Include="Game.c" />
     <ClCompile Include="Graphics_GL2.c" />
-    <ClCompile Include="Graphics_N64.c" />
-    <ClCompile Include="Graphics_NDS.c" />
-    <ClCompile Include="Graphics_PS1.c" />
-    <ClCompile Include="Graphics_PS2.c" />
-    <ClCompile Include="Graphics_PS3.c" />
-    <ClCompile Include="Graphics_PSP.c" />
-    <ClCompile Include="Graphics_PSVita.c" />
     <ClCompile Include="Graphics_SoftGPU.c" />
-    <ClCompile Include="Graphics_WiiU.c" />
-    <ClCompile Include="Graphics_Xbox.c" />
-    <ClCompile Include="Graphics_Xbox360.c" />
     <ClCompile Include="Gui.c" />
     <ClCompile Include="HeldBlockRenderer.c" />
     <ClCompile Include="Http_Web.c" />
@@ -495,7 +486,6 @@
     <ClCompile Include="Inventory.c" />
     <ClCompile Include="Launcher.c" />
     <ClCompile Include="LBackend.c" />
-    <ClCompile Include="LBackend_Android.c" />
     <ClCompile Include="LScreens.c" />
     <ClCompile Include="LWeb.c" />
     <ClCompile Include="LWidgets.c" />
@@ -505,27 +495,7 @@
     <ClCompile Include="Model.c" />
     <ClCompile Include="Menus.c" />
     <ClCompile Include="FancyLighting.c" />
-    <ClCompile Include="Platform_3DS.c" />
-    <ClCompile Include="Platform_Android.c" />
-    <ClCompile Include="Platform_BeOS.cpp" />
-    <ClCompile Include="Platform_Dreamcast.c" />
-    <ClCompile Include="Platform_GCWii.c" />
-    <ClCompile Include="Platform_MacClassic.c" />
-    <ClCompile Include="Platform_N64.c" />
-    <ClCompile Include="Platform_NDS.c" />
-    <ClCompile Include="Platform_Posix.c" />
-    <ClCompile Include="Platform_PS1.c" />
-    <ClCompile Include="Platform_PS2.c" />
-    <ClCompile Include="Platform_PS3.c" />
-    <ClCompile Include="Platform_PSP.c" />
-    <ClCompile Include="Platform_PSVita.c" />
-    <ClCompile Include="Platform_Saturn.c" />
-    <ClCompile Include="Platform_Switch.c" />
-    <ClCompile Include="Platform_Web.c" />
-    <ClCompile Include="Platform_WiiU.c" />
     <ClCompile Include="Platform_Windows.c" />
-    <ClCompile Include="Platform_Xbox.c" />
-    <ClCompile Include="Platform_Xbox360.c" />
     <ClCompile Include="Protocol.c" />
     <ClCompile Include="Physics.c" />
     <ClCompile Include="IsometricDrawer.c" />
@@ -540,7 +510,6 @@
     <ClCompile Include="Queue.c" />
     <ClCompile Include="SelOutlineRenderer.c" />
     <ClCompile Include="Picking.c" />
-    <ClCompile Include="main.c" />
     <ClCompile Include="Resources.c" />
     <ClCompile Include="Screens.c" />
     <ClCompile Include="SelectionBox.c" />
@@ -556,30 +525,8 @@
     <ClCompile Include="Vorbis.c" />
     <ClCompile Include="Widgets.c" />
     <ClCompile Include="Logger.c" />
-    <ClCompile Include="Window_3DS.c" />
-    <ClCompile Include="Window_Android.c" />
-    <ClCompile Include="Window_BeOS.cpp" />
-    <ClCompile Include="Window_Dreamcast.c" />
-    <ClCompile Include="Window_GCWii.c" />
-    <ClCompile Include="Window_MacClassic.c" />
-    <ClCompile Include="Window_N64.c" />
-    <ClCompile Include="Window_NDS.c" />
-    <ClCompile Include="Window_PS1.c" />
-    <ClCompile Include="Window_PS2.c" />
-    <ClCompile Include="Window_PS3.c" />
-    <ClCompile Include="Window_PSP.c" />
-    <ClCompile Include="Window_PSVita.c" />
-    <ClCompile Include="Window_Saturn.c" />
-    <ClCompile Include="Window_SDL2.c" />
-    <ClCompile Include="Window_SDL3.c" />
-    <ClCompile Include="Window_Switch.c" />
     <ClCompile Include="Window_Terminal.c" />
-    <ClCompile Include="Window_Web.c" />
-    <ClCompile Include="Window_WiiU.c" />
     <ClCompile Include="Window_Win.c" />
-    <ClCompile Include="Window_X11.c" />
-    <ClCompile Include="Window_Xbox.c" />
-    <ClCompile Include="Window_Xbox360.c" />
     <ClCompile Include="World.c" />
     <ClCompile Include="_autofit.c" />
     <ClCompile Include="_cff.c" />
@@ -599,11 +546,6 @@
   <ItemGroup>
     <ResourceCompile Include="..\misc\windows\CCicon.rc" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="LBackend_ios.m" />
-    <None Include="Window_cocoa.m" />
-    <None Include="Window_ios.m" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/src/ClassiCube.vcxproj.filters b/src/ClassiCube.vcxproj.filters
index b60cbea90..052217a08 100644
--- a/src/ClassiCube.vcxproj.filters
+++ b/src/ClassiCube.vcxproj.filters
@@ -354,6 +354,15 @@
     <ClInclude Include="Queue.h">
       <Filter>Header Files\Utils</Filter>
     </ClInclude>
+    <ClInclude Include="main_impl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="main.h">
+      <Filter>Header Files\Platform</Filter>
+    </ClInclude>
+    <ClInclude Include="_AudioBase.h">
+      <Filter>Header Files\Audio</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="String.c">
@@ -401,9 +410,6 @@
     <ClCompile Include="Builder.c">
       <Filter>Source Files\MeshBuilder</Filter>
     </ClCompile>
-    <ClCompile Include="main.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Entity.c">
       <Filter>Source Files\Entities</Filter>
     </ClCompile>
@@ -560,12 +566,6 @@
     <ClCompile Include="Animations.c">
       <Filter>Source Files\TexturePack</Filter>
     </ClCompile>
-    <ClCompile Include="Platform_Web.c">
-      <Filter>Source Files\Platform</Filter>
-    </ClCompile>
-    <ClCompile Include="Platform_Posix.c">
-      <Filter>Source Files\Platform</Filter>
-    </ClCompile>
     <ClCompile Include="LBackend.c">
       <Filter>Source Files\Launcher</Filter>
     </ClCompile>
@@ -581,9 +581,6 @@
     <ClCompile Include="Graphics_D3D11.c">
       <Filter>Source Files\Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="Platform_Android.c">
-      <Filter>Source Files\Platform</Filter>
-    </ClCompile>
     <ClCompile Include="Graphics_GL1.c">
       <Filter>Source Files\Graphics</Filter>
     </ClCompile>
@@ -599,200 +596,44 @@
     <ClCompile Include="SSL.c">
       <Filter>Source Files\Network</Filter>
     </ClCompile>
-    <ClCompile Include="Platform_PSP.c">
-      <Filter>Source Files\Platform</Filter>
-    </ClCompile>
-    <ClCompile Include="Platform_GCWii.c">
-      <Filter>Source Files\Platform</Filter>
-    </ClCompile>
-    <ClCompile Include="Platform_3DS.c">
-      <Filter>Source Files\Platform</Filter>
-    </ClCompile>
-    <ClCompile Include="Platform_Windows.c">
-      <Filter>Source Files\Platform</Filter>
-    </ClCompile>
-    <ClCompile Include="Graphics_3DS.c">
-      <Filter>Source Files\Graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="Graphics_PSP.c">
-      <Filter>Source Files\Graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="Graphics_GCWii.c">
-      <Filter>Source Files\Graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="Graphics_Dreamcast.c">
-      <Filter>Source Files\Graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="Platform_Dreamcast.c">
-      <Filter>Source Files\Platform</Filter>
-    </ClCompile>
-    <ClCompile Include="Window_Android.c">
-      <Filter>Source Files\Window</Filter>
-    </ClCompile>
-    <ClCompile Include="Window_Dreamcast.c">
-      <Filter>Source Files\Window</Filter>
-    </ClCompile>
-    <ClCompile Include="Window_GCWii.c">
-      <Filter>Source Files\Window</Filter>
-    </ClCompile>
-    <ClCompile Include="Window_PSP.c">
-      <Filter>Source Files\Window</Filter>
-    </ClCompile>
-    <ClCompile Include="Window_3DS.c">
-      <Filter>Source Files\Window</Filter>
-    </ClCompile>
-    <ClCompile Include="Window_Web.c">
-      <Filter>Source Files\Window</Filter>
-    </ClCompile>
     <ClCompile Include="Window_Win.c">
       <Filter>Source Files\Window</Filter>
     </ClCompile>
-    <ClCompile Include="Window_X11.c">
-      <Filter>Source Files\Window</Filter>
-    </ClCompile>
-    <ClCompile Include="Window_PSVita.c">
-      <Filter>Source Files\Window</Filter>
-    </ClCompile>
-    <ClCompile Include="Window_Xbox.c">
-      <Filter>Source Files\Window</Filter>
-    </ClCompile>
-    <ClCompile Include="Platform_Xbox.c">
-      <Filter>Source Files\Platform</Filter>
-    </ClCompile>
-    <ClCompile Include="Platform_PSVita.c">
-      <Filter>Source Files\Platform</Filter>
-    </ClCompile>
-    <ClCompile Include="Graphics_Xbox.c">
-      <Filter>Source Files\Graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="Graphics_PSVita.c">
-      <Filter>Source Files\Graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="Graphics_PS3.c">
-      <Filter>Source Files\Graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="Platform_PS3.c">
-      <Filter>Source Files\Platform</Filter>
-    </ClCompile>
-    <ClCompile Include="Window_PS3.c">
-      <Filter>Source Files\Window</Filter>
-    </ClCompile>
     <ClCompile Include="EntityRenderers.c">
       <Filter>Source Files\Entities</Filter>
     </ClCompile>
-    <ClCompile Include="Graphics_N64.c">
-      <Filter>Source Files\Graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="Platform_N64.c">
-      <Filter>Source Files\Platform</Filter>
-    </ClCompile>
-    <ClCompile Include="Window_N64.c">
-      <Filter>Source Files\Window</Filter>
-    </ClCompile>
     <ClCompile Include="Graphics_SoftGPU.c">
       <Filter>Source Files\Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="Window_PS2.c">
-      <Filter>Source Files\Window</Filter>
-    </ClCompile>
-    <ClCompile Include="Platform_PS2.c">
-      <Filter>Source Files\Platform</Filter>
-    </ClCompile>
-    <ClCompile Include="Graphics_PS2.c">
-      <Filter>Source Files\Graphics</Filter>
-    </ClCompile>
     <ClCompile Include="Commands.c">
       <Filter>Source Files\Game</Filter>
     </ClCompile>
-    <ClCompile Include="Platform_Xbox360.c">
-      <Filter>Source Files\Platform</Filter>
-    </ClCompile>
-    <ClCompile Include="Window_Xbox360.c">
-      <Filter>Source Files\Window</Filter>
-    </ClCompile>
-    <ClCompile Include="Graphics_Xbox360.c">
-      <Filter>Source Files\Graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="AudioBackend.c">
-      <Filter>Source Files\Audio</Filter>
-    </ClCompile>
-    <ClCompile Include="Window_NDS.c">
-      <Filter>Source Files\Window</Filter>
-    </ClCompile>
-    <ClCompile Include="Window_PS1.c">
-      <Filter>Source Files\Window</Filter>
-    </ClCompile>
-    <ClCompile Include="Window_Switch.c">
-      <Filter>Source Files\Window</Filter>
-    </ClCompile>
-    <ClCompile Include="Window_SDL3.c">
-      <Filter>Source Files\Window</Filter>
-    </ClCompile>
-    <ClCompile Include="Platform_NDS.c">
-      <Filter>Source Files\Platform</Filter>
-    </ClCompile>
-    <ClCompile Include="Platform_PS1.c">
-      <Filter>Source Files\Platform</Filter>
-    </ClCompile>
-    <ClCompile Include="Platform_WiiU.c">
-      <Filter>Source Files\Platform</Filter>
-    </ClCompile>
-    <ClCompile Include="Platform_Switch.c">
-      <Filter>Source Files\Platform</Filter>
-    </ClCompile>
-    <ClCompile Include="Graphics_NDS.c">
-      <Filter>Source Files\Graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="Graphics_PS1.c">
-      <Filter>Source Files\Graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="Graphics_WiiU.c">
-      <Filter>Source Files\Graphics</Filter>
-    </ClCompile>
     <ClCompile Include="FancyLighting.c">
       <Filter>Source Files\Map</Filter>
     </ClCompile>
     <ClCompile Include="Queue.c">
       <Filter>Source Files\Utils</Filter>
     </ClCompile>
-    <ClCompile Include="Platform_MacClassic.c">
-      <Filter>Source Files\Platform</Filter>
-    </ClCompile>
-    <ClCompile Include="Window_MacClassic.c">
-      <Filter>Source Files\Window</Filter>
-    </ClCompile>
-    <ClCompile Include="Window_BeOS.cpp">
-      <Filter>Source Files\Window</Filter>
-    </ClCompile>
-    <ClCompile Include="Platform_BeOS.cpp">
-      <Filter>Source Files\Platform</Filter>
-    </ClCompile>
     <ClCompile Include="Window_Terminal.c">
       <Filter>Source Files\Window</Filter>
     </ClCompile>
-    <ClCompile Include="Window_Saturn.c">
-      <Filter>Source Files\Window</Filter>
-    </ClCompile>
-    <ClCompile Include="Platform_Saturn.c">
-      <Filter>Source Files\Platform</Filter>
-    </ClCompile>
     <ClCompile Include="TouchUI.c">
       <Filter>Source Files\2D</Filter>
     </ClCompile>
-    <ClCompile Include="LBackend_Android.c">
-      <Filter>Source Files\Launcher</Filter>
-    </ClCompile>
-    <ClCompile Include="Window_SDL2.c">
-      <Filter>Source Files\Window</Filter>
-    </ClCompile>
     <ClCompile Include="InputHandler.c">
       <Filter>Source Files\Game</Filter>
     </ClCompile>
     <ClCompile Include="MenuOptions.c">
       <Filter>Source Files\2D</Filter>
     </ClCompile>
-    <ClCompile Include="Window_WiiU.c">
-      <Filter>Source Files\Window</Filter>
+    <ClCompile Include="Audio_WinMM.c">
+      <Filter>Source Files\Audio</Filter>
+    </ClCompile>
+    <ClCompile Include="Audio_OpenAL.c">
+      <Filter>Source Files\Audio</Filter>
+    </ClCompile>
+    <ClCompile Include="Platform_Windows.c">
+      <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -800,15 +641,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Window_cocoa.m">
-      <Filter>Source Files\Window</Filter>
-    </None>
-    <None Include="Window_ios.m">
-      <Filter>Source Files\Window</Filter>
-    </None>
-    <None Include="LBackend_ios.m">
-      <Filter>Source Files\Launcher</Filter>
-    </None>
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/EnvRenderer.c b/src/EnvRenderer.c
index 4bc2b8a22..d88564504 100644
--- a/src/EnvRenderer.c
+++ b/src/EnvRenderer.c
@@ -66,7 +66,6 @@ static cc_bool CameraInsideBlock(BlockID block, IVec3* coords) {
 static PackedCol CalcFog(float* density) {
 	IVec3 coords;
 	BlockID block;
-	float blend;
 
 	IVec3_Floor(&coords, &Camera.CurrentPos); /* coords = floor(camera_pos); */
 	block = World_SafeGetBlock(coords.x, coords.y, coords.z);