From a4b2152e85025ac35f2c0d8a25b38c4ac6ad11ee Mon Sep 17 00:00:00 2001 From: Jason Perkins Date: Wed, 4 Jan 2012 15:01:22 -0500 Subject: [PATCH] Removed dynamic loading of Ole32 on Windows (see patch #3456407) --- premake4.lua | 3 +++ src/host/os_uuid.c | 10 +--------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/premake4.lua b/premake4.lua index 4ac26634..1c2f5535 100644 --- a/premake4.lua +++ b/premake4.lua @@ -52,6 +52,9 @@ configuration "vs2005" defines {"_CRT_SECURE_NO_DEPRECATE" } + configuration "windows" + links { "ole32" } + configuration "linux" defines { "LUA_USE_POSIX", "LUA_USE_DLOPEN" } links { "m", "dl" } diff --git a/src/host/os_uuid.c b/src/host/os_uuid.c index c2521794..b06b29b5 100644 --- a/src/host/os_uuid.c +++ b/src/host/os_uuid.c @@ -5,7 +5,7 @@ */ #include "premake.h" - +#include int os_uuid(lua_State* L) { @@ -13,15 +13,7 @@ int os_uuid(lua_State* L) char uuid[38]; #if PLATFORM_WINDOWS - - static int (__stdcall *CoCreateGuid)(char*) = NULL; - if (CoCreateGuid == NULL) - { - HMODULE hOleDll = LoadLibrary("OLE32.DLL"); - CoCreateGuid = (int(__stdcall*)(char*))GetProcAddress(hOleDll, "CoCreateGuid"); - } CoCreateGuid((char*)bytes); - #else int result;