mirror of
				https://github.com/subsurface/subsurface.git
				synced 2025-02-19 22:16:15 +00:00 
			
		
		
		
	Matching build fixes for cross built Windows
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
		
							parent
							
								
									aa3838308b
								
							
						
					
					
						commit
						060e5c764c
					
				
					 5 changed files with 14 additions and 0 deletions
				
			
		
							
								
								
									
										2
									
								
								linux.c
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								linux.c
									
										
									
									
									
								
							|  | @ -2,7 +2,9 @@ | ||||||
| /* implements Linux specific functions */ | /* implements Linux specific functions */ | ||||||
| #include "dive.h" | #include "dive.h" | ||||||
| #include "display.h" | #include "display.h" | ||||||
|  | #if USE_GTK_UI | ||||||
| #include "display-gtk.h" | #include "display-gtk.h" | ||||||
|  | #endif | ||||||
| #include <gconf/gconf-client.h> | #include <gconf/gconf-client.h> | ||||||
| #include <string.h> | #include <string.h> | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
							
								
								
									
										3
									
								
								macos.c
									
										
									
									
									
								
							
							
						
						
									
										3
									
								
								macos.c
									
										
									
									
									
								
							|  | @ -2,7 +2,10 @@ | ||||||
| /* implements Mac OS X specific functions */ | /* implements Mac OS X specific functions */ | ||||||
| #include <stdlib.h> | #include <stdlib.h> | ||||||
| #include "dive.h" | #include "dive.h" | ||||||
|  | #include "display.h" | ||||||
|  | #if USE_GTK_UI | ||||||
| #include "display-gtk.h" | #include "display-gtk.h" | ||||||
|  | #endif /* USE_GTK_UI */ | ||||||
| #include <CoreFoundation/CoreFoundation.h> | #include <CoreFoundation/CoreFoundation.h> | ||||||
| #include <CoreServices/CoreServices.h> | #include <CoreServices/CoreServices.h> | ||||||
| #include <mach-o/dyld.h> | #include <mach-o/dyld.h> | ||||||
|  |  | ||||||
										
											Binary file not shown.
										
									
								
							|  | @ -6,7 +6,9 @@ | ||||||
| 
 | 
 | ||||||
| #include "dive.h" | #include "dive.h" | ||||||
| #include "display.h" | #include "display.h" | ||||||
|  | #if USE_GTK_UI | ||||||
| #include "display-gtk.h" | #include "display-gtk.h" | ||||||
|  | #endif | ||||||
| #include "divelist.h" | #include "divelist.h" | ||||||
| #include "color.h" | #include "color.h" | ||||||
| #include "libdivecomputer/parser.h" | #include "libdivecomputer/parser.h" | ||||||
|  |  | ||||||
|  | @ -1,7 +1,10 @@ | ||||||
| /* windows.c */ | /* windows.c */ | ||||||
| /* implements Windows specific functions */ | /* implements Windows specific functions */ | ||||||
| #include "dive.h" | #include "dive.h" | ||||||
|  | #include "display.h" | ||||||
|  | #if USE_GTK_UI | ||||||
| #include "display-gtk.h" | #include "display-gtk.h" | ||||||
|  | #endif | ||||||
| #include <windows.h> | #include <windows.h> | ||||||
| #include <shlobj.h> | #include <shlobj.h> | ||||||
| 
 | 
 | ||||||
|  | @ -128,6 +131,7 @@ void subsurface_close_conf(void) | ||||||
| 	RegCloseKey(hkey); | 	RegCloseKey(hkey); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | #if USE_GTK_UI | ||||||
| int subsurface_fill_device_list(GtkListStore *store) | int subsurface_fill_device_list(GtkListStore *store) | ||||||
| { | { | ||||||
| 	const int bufdef = 512; | 	const int bufdef = 512; | ||||||
|  | @ -194,6 +198,7 @@ int subsurface_fill_device_list(GtkListStore *store) | ||||||
| 	} | 	} | ||||||
| 	return index; | 	return index; | ||||||
| } | } | ||||||
|  | #endif /* USE_GTK_UI */ | ||||||
| 
 | 
 | ||||||
| const char *subsurface_icon_name() | const char *subsurface_icon_name() | ||||||
| { | { | ||||||
|  | @ -231,11 +236,13 @@ const char *subsurface_gettext_domainpath(char *argv0) | ||||||
| 	return "./share/locale"; | 	return "./share/locale"; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | #if USE_GTK_UI | ||||||
| void subsurface_ui_setup(GtkSettings *settings, GtkWidget *menubar, | void subsurface_ui_setup(GtkSettings *settings, GtkWidget *menubar, | ||||||
| 		GtkWidget *vbox, GtkUIManager *ui_manager) | 		GtkWidget *vbox, GtkUIManager *ui_manager) | ||||||
| { | { | ||||||
| 	gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0); | 	gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0); | ||||||
| } | } | ||||||
|  | #endif /* USE_GTK_UI */ | ||||||
| 
 | 
 | ||||||
| /* barely documented API */ | /* barely documented API */ | ||||||
| extern int __wgetmainargs(int *, wchar_t ***, wchar_t ***, int, int *); | extern int __wgetmainargs(int *, wchar_t ***, wchar_t ***, int, int *); | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue