Mercurial > mxe-octave
view src/libgsf-1-fixes.patch @ 4472:0fdeee4cfe11
gnuplot: enable Qt terminal and set default to wxt
* src/gnuplot.mk: Depend on qt5 and build with QT=1 QT_DIR=$(HOST_PREFIX)/qt QT_BIN_DIR=(BUILD_TOOLS_PREFIX)/bin,
install gnuplot_qt.exe
* src/gnuplot-1-fixes.patch: add to patchto allow override of QT tools and paths
* installer-files/octave-firsttime.vbs: set GNUTERM=wxt
* installer-files/octave.vbs: set GNUTERM=wxt
* installer-files/octave.bat: set GNUTERM=wxt
* installer-files/cmdshell.bat: set GNUTERM=wxt
author | Mike Miller <mtmiller@octave.org> |
---|---|
date | Wed, 06 Sep 2017 16:19:37 -0700 |
parents | 8147e6f8659a |
children |
line wrap: on
line source
This file is part of MXE. See index.html for further information. Contains ad hoc patches for cross building. From f2970c9c697dd6a6104495ea91ed2488ead297b7 Mon Sep 17 00:00:00 2001 From: MXE Date: Fri, 24 Sep 2010 23:34:26 +0200 Subject: [PATCH 1/1] s,DllMain,static _disabled_DllMain, diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c index d7a7247..cc52d99 100644 --- a/gsf/gsf-utils.c +++ b/gsf/gsf-utils.c @@ -76,9 +76,17 @@ static GTypeModule *static_type_module = NULL; #include <windows.h> static HMODULE gsf_dll_hmodule; BOOL WINAPI +#ifdef DLL_EXPORT DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); +#else +static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); +#endif BOOL WINAPI +#ifdef DLL_EXPORT DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved) +#else +static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved) +#endif { if (fdwReason == DLL_PROCESS_ATTACH) gsf_dll_hmodule = hinstDLL; return TRUE; -- 1.7.1