summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-08 10:15:16 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-08 10:20:23 -0300
commitaa60e02cf602c9c54b54eee257b3bfa675724788 (patch)
treedd57601b896729b5ef15d60680dddee0abec52b1
parent790f629e5e1cccf721948b1153bb0dee139ac1a5 (diff)
fixes compilation in windows?
-rw-r--r--platform/windows/os_windows.cpp16
1 files changed, 2 insertions, 14 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 5beef2693f..02138891b7 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -30,7 +30,7 @@
#include "os_windows.h"
#include "drivers/gles3/rasterizer_gles3.h"
-#include "os/memory_pool_dynamic_static.h"
+
#include "drivers/windows/thread_windows.h"
#include "drivers/windows/semaphore_windows.h"
#include "drivers/windows/mutex_windows.h"
@@ -47,7 +47,7 @@
#include "packet_peer_udp_winsock.h"
#include "stream_peer_winsock.h"
#include "lang_table.h"
-#include "os/memory_pool_dynamic_prealloc.h"
+
#include "globals.h"
#include "io/marshalls.h"
#include "joystick.h"
@@ -166,7 +166,6 @@ const char * OS_Windows::get_audio_driver_name(int p_driver) const {
return AudioDriverManagerSW::get_driver(p_driver)->get_name();
}
-static MemoryPoolDynamic *mempool_dynamic=NULL;
void OS_Windows::initialize_core() {
@@ -194,14 +193,6 @@ void OS_Windows::initialize_core() {
StreamPeerWinsock::make_default();
PacketPeerUDPWinsock::make_default();
-#if 1
- mempool_dynamic = memnew( MemoryPoolDynamicStatic );
-#else
-#define DYNPOOL_SIZE 4*1024*1024
- void * buffer = malloc( DYNPOOL_SIZE );
- mempool_dynamic = memnew( MemoryPoolDynamicPrealloc(buffer,DYNPOOL_SIZE) );
-
-#endif
// We need to know how often the clock is updated
if( !QueryPerformanceFrequency((LARGE_INTEGER *)&ticks_per_second) )
@@ -1303,9 +1294,6 @@ void OS_Windows::finalize_core() {
memdelete(process_map);
- if (mempool_dynamic)
- memdelete( mempool_dynamic );
-
TCPServerWinsock::cleanup();
StreamPeerWinsock::cleanup();