Commit 2cb4653e3290fea9d4ce3ff4f174c5bda6a4c976
1 parent
1cdf2b41
Exists in
master
and in
1 other branch
Fixing win32 build, adding 'changes' file in windows app.
Showing
2 changed files
with
7 additions
and
1 deletions
Show diff stats
Makefile.in
@@ -335,6 +335,10 @@ install-windows-application: \ | @@ -335,6 +335,10 @@ install-windows-application: \ | ||
335 | $(PRODUCT_NAME).png \ | 335 | $(PRODUCT_NAME).png \ |
336 | $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME).png | 336 | $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME).png |
337 | 337 | ||
338 | + @$(INSTALL_DATA) \ | ||
339 | + CHANGELOG \ | ||
340 | + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PACKAGE_NAME).changes | ||
341 | + | ||
338 | install-icons: | 342 | install-icons: |
339 | 343 | ||
340 | @$(MKDIR) \ | 344 | @$(MKDIR) \ |
src/objects/os/windows/savedesktopicon.c
@@ -55,6 +55,8 @@ | @@ -55,6 +55,8 @@ | ||
55 | #include <v3270/tools.h> | 55 | #include <v3270/tools.h> |
56 | #include <v3270/keyfile.h> | 56 | #include <v3270/keyfile.h> |
57 | #include <v3270/settings.h> | 57 | #include <v3270/settings.h> |
58 | +#include <objidl.h> | ||
59 | +#include <shlguid.h> | ||
58 | 60 | ||
59 | static GtkWidget * factory(V3270SimpleAction *action, GtkWidget *terminal); | 61 | static GtkWidget * factory(V3270SimpleAction *action, GtkWidget *terminal); |
60 | static void response(GtkWidget *dialog, gint response_id, GtkWidget *terminal); | 62 | static void response(GtkWidget *dialog, gint response_id, GtkWidget *terminal); |
@@ -238,7 +240,7 @@ static HRESULT CreateShortCut(const char * pszTargetfile, const char * pszTarget | @@ -238,7 +240,7 @@ static HRESULT CreateShortCut(const char * pszTargetfile, const char * pszTarget | ||
238 | 240 | ||
239 | HRESULT hRes = | 241 | HRESULT hRes = |
240 | CoCreateInstance( | 242 | CoCreateInstance( |
241 | - CLSID_ShellLink, // predefined CLSID of the IShellLink object | 243 | + &CLSID_ShellLink, // predefined CLSID of the IShellLink object |
242 | NULL, // pointer to parent interface if part of aggregate | 244 | NULL, // pointer to parent interface if part of aggregate |
243 | CLSCTX_INPROC_SERVER, // caller and called code are in same process | 245 | CLSCTX_INPROC_SERVER, // caller and called code are in same process |
244 | &IID_IShellLink, // predefined interface of the IShellLink object | 246 | &IID_IShellLink, // predefined interface of the IShellLink object |