Parcourir la source

Removed bits not specific to Windows

David Wimsey il y a 11 ans
Parent
commit
758f6cb0f9
1 fichiers modifiés avec 2 ajouts et 10 suppressions
  1. 2 10
      Samples/basic/directx/src/main.cpp

+ 2 - 10
Samples/basic/directx/src/main.cpp

@@ -31,6 +31,8 @@
 #include <Shell.h>
 #include <Shell.h>
 #include "RenderInterfaceDirectX.h"
 #include "RenderInterfaceDirectX.h"
 
 
+#include <windows.h>
+
 static Rocket::Core::Context* context = NULL;
 static Rocket::Core::Context* context = NULL;
 
 
 ShellRenderInterfaceExtensions *shell_renderer;
 ShellRenderInterfaceExtensions *shell_renderer;
@@ -44,22 +46,12 @@ void GameLoop()
 	shell_renderer->PresentRenderBuffer();
 	shell_renderer->PresentRenderBuffer();
 }
 }
 
 
-#if defined ROCKET_PLATFORM_WIN32
-#include <windows.h>
 int APIENTRY WinMain(HINSTANCE ROCKET_UNUSED_PARAMETER(instance_handle), HINSTANCE ROCKET_UNUSED_PARAMETER(previous_instance_handle), char* ROCKET_UNUSED_PARAMETER(command_line), int ROCKET_UNUSED_PARAMETER(command_show))
 int APIENTRY WinMain(HINSTANCE ROCKET_UNUSED_PARAMETER(instance_handle), HINSTANCE ROCKET_UNUSED_PARAMETER(previous_instance_handle), char* ROCKET_UNUSED_PARAMETER(command_line), int ROCKET_UNUSED_PARAMETER(command_show))
-#else
-int main(int ROCKET_UNUSED_PARAMETER(argc), char** ROCKET_UNUSED_PARAMETER(argv))
-#endif
 {
 {
-#ifdef ROCKET_PLATFORM_WIN32
 	ROCKET_UNUSED(instance_handle);
 	ROCKET_UNUSED(instance_handle);
 	ROCKET_UNUSED(previous_instance_handle);
 	ROCKET_UNUSED(previous_instance_handle);
 	ROCKET_UNUSED(command_line);
 	ROCKET_UNUSED(command_line);
 	ROCKET_UNUSED(command_show);
 	ROCKET_UNUSED(command_show);
-#else
-	ROCKET_UNUSED(argc);
-	ROCKET_UNUSED(argv);
-#endif
 
 
 	int window_width = 1024;
 	int window_width = 1024;
 	int window_height = 768;
 	int window_height = 768;