CMakeLists.txt @@ -18,7 +18,9 @@ static char *g_version = "1.4"; #include <ole2.h> #include <ocidl.h> +#ifndef NO_HTMLHELP #include <htmlhelp.h> // HtmlHelp +#endif #include <assert.h> #include <stdio.h> @@ -186,10 +188,15 @@ static int luacom_ShowHelp(lua_State *L) size_t len = strlen(pHelpFile); if (len >= 4 && _stricmp(pHelpFile + len - 4, ".chm") == 0) { +#ifdef NO_HTMLHELP + ::MessageBox(NULL, "Error: HtmlHelp support not included", + "LuaCOM", MB_ICONEXCLAMATION); +#else if(context != 0) HtmlHelp(NULL, pHelpFile, HH_HELP_CONTEXT, context); else HtmlHelp(NULL, pHelpFile, HH_DISPLAY_TOC, 0); +#endif } else { @@ -2686,3 +2693,13 @@ LUACOM_API int luacom_detectAutomation(lua_State *L, int argc, char *argv[]) return automation_result; } + + +// preprocessor warnings +#ifdef NO_HTMLHTML +#ifdef _MSC_VER +#pragma message("htmlhelp.h disabled") +#else +#warning(htmlhtlp.h disabled) +#endif +#endif src/library/luacom.cpp @@ -20,6 +20,11 @@ static char *rcsname = "$Name: $"; #include "LuaCompat.h" +#if defined(__CYGWIN__) || defined(__MINGW32__) +#include <initguid.h> +DEFINE_GUID(IID_IProxyManager, 0x00000008, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46); +#endif + long tLuaCOM::NEXT_ID = 0; tLuaCOM::tLuaCOM(lua_State* L, src/library/tLuaCOM.cpp @@ -8,7 +8,6 @@ static char *rcsname = "$Name: $"; #include <ole2.h> -#include <comdef.h> extern "C" { @@ -34,7 +33,6 @@ extern "C" #include "luacom_internal.h" - #define LUA_NOOBJECT 0 ////////////////////////////////////////////////////////////////////// @@ -295,7 +293,7 @@ void tLuaCOMTypeHandler::com2lua(lua_State* L, VARIANTARG varg_orig, bool is_var break; } - IUnknownPtr pProxMgr; + IUnknown* pProxMgr; ILuaDispatch *pLuaDispatch; if((pdisp->QueryInterface(IID_IProxyManager, (void**)&pProxMgr)==E_NOINTERFACE) && SUCCEEDED(pdisp->QueryInterface(IID_ILuaDispatch, (void**)&pLuaDispatch)) && @@ -330,7 +328,7 @@ void tLuaCOMTypeHandler::com2lua(lua_State* L, VARIANTARG varg_orig, bool is_var if(SUCCEEDED(hr)) { - IUnknownPtr pProxMgr; + IUnknown* pProxMgr; ILuaDispatch *pLuaDispatch; if((pdisp->QueryInterface(IID_IProxyManager, (void**)&pProxMgr)==E_NOINTERFACE) && SUCCEEDED(pdisp->QueryInterface(IID_ILuaDispatch, (void**)&pLuaDispatch)) && src/library/tLuaCOMTypeHandler.cpp @@ -21,7 +21,8 @@ extern "C" #include "LuaCompat.h" } -#ifdef __MINGW32__ // hack for MinGW +// hacks for certain compilers +#if defined(__MINGW32__) || defined(__CYGWIN__) #define GUIDKIND_DEFAULT_SOURCE_DISP_IID 1 #endif src/library/tLuaDispatch.cpp @@ -349,7 +349,7 @@ void tUtil::ShowHelp(const char *filename, unsigned long context) sprintf(context_param, "-mapid %d", context); else context_param[0] = '\0'; -#if !defined(__WINE__) || defined(__MSVCRT__) +#if !defined(__WINE__) && !defined(__CYGWIN__) _spawnlp(_P_NOWAIT, "hh.exe", "hh.exe", context_param, filename, NULL); #else MessageBox(NULL, "FIX - not implemented - _spawnlp", "LuaCOM", MB_ICONEXCLAMATION); src/library/tUtil.cpp cf7ea2c9157bc4b9e5e892d938bf24b921f450b4 U-DC\david david@dc.(none) http://github.com/davidm/luacom/commit/630f4e622742f5c068fbe75e32568fb510e75dbf 630f4e622742f5c068fbe75e32568fb510e75dbf 2009-09-17T23:46:06-07:00 2009-09-17T23:46:06-07:00 now at least compiles under cygwin/mingw; Add cmake CMakeLists.txt build file c9bf37cf79aca6a168ad15ebaf454bb7d1646eff U-DC\david david@dc.(none)