Merge pull request #4 from andrebreves/develop

Updating MACOS code.

Merge pull request #4 from andrebreves/develop
Updating MACOS code.
Perry Werneck · GitHub
2 parents 4746861e ae5fcb77
Showing 4 changed files with 37 additions and 3 deletions Show diff stats
README.md
configure.ac
src/dialogs/print/settings.c
src/terminal/font/properties.c
@@ -75,3 +75,31 @@ Compiling for Windows (With MSYS2)
 	* make all
  
  
+Building for macOS (using homebrew)
+===================================
+
+1. Build and install [lib3270](../../../lib3270)
+
+2. Install additional dependencies
+
+	```shell
+	$ brew install gtk+3
+	```
+
+3. Configure, build and install
+
+	```shell
+	$ ./autogen.sh --prefix="$(brew --cellar)/libv3270/5.3"
+	$ make all && make install
+	$ brew link libv3270
+	```
+
+Uninstalling
+------------
+
+1. To uninstall
+
+	```shell
+	$ brew unlink libv3270
+	$ rm -fr "$(brew --cellar)/libv3270"
+	```
@@ -110,7 +110,7 @@ case &quot;$host&quot; in
  
 		INSTALL_PACKAGES="linux-lib ${INSTALL_PACKAGES}"
  
-		app_cv_static='yes'
+		app_cv_static='no'
 		;;
  
  	*)
@@ -79,7 +79,11 @@ static void V3270PrintSettings_init(V3270PrintSettings *widget)
 	};
  
 	size_t f;
-	widget->font 		= v3270_font_selection_new("monospace");
+	#ifdef __APPLE__
+		widget->font 		= v3270_font_selection_new("Courier New");
+	#else
+		widget->font 		= v3270_font_selection_new("monospace");
+	#endif
 	widget->color 		= v3270_color_scheme_new();
 	widget->selected 	= gtk_check_button_new_with_label( _("Print selection box") );
  
@@ -45,8 +45,10 @@ static const gchar * invalid_font_messages[] = {
  
 const gchar * v3270_get_default_font_name()
 {
-#ifdef _WIN32
+#if defined(_WIN32)
 	return "Lucida Console";
+#elif defined(__APPLE__)
+	return "Courier New";
 #else
 	return "monospace";
 #endif // _WIN32
...	...	@@ -75,3 +75,31 @@ Compiling for Windows (With MSYS2)
75	75	* make all
76	76
77	77
	78	+Building for macOS (using homebrew)
	79	+===================================
	80	+
	81	+1. Build and install [lib3270](../../../lib3270)
	82	+
	83	+2. Install additional dependencies
	84	+
	85	+ ```shell
	86	+ $ brew install gtk+3
	87	+ ```
	88	+
	89	+3. Configure, build and install
	90	+
	91	+ ```shell
	92	+ $ ./autogen.sh --prefix="$(brew --cellar)/libv3270/5.3"
	93	+ $ make all && make install
	94	+ $ brew link libv3270
	95	+ ```
	96	+
	97	+Uninstalling
	98	+------------
	99	+
	100	+1. To uninstall
	101	+
	102	+ ```shell
	103	+ $ brew unlink libv3270
	104	+ $ rm -fr "$(brew --cellar)/libv3270"
	105	+ ```
...	...
...	...	@@ -110,7 +110,7 @@ case "$host" in
110	110
111	111	INSTALL_PACKAGES="linux-lib ${INSTALL_PACKAGES}"
112	112
113		- app_cv_static='yes'
	113	+ app_cv_static='no'
114	114	;;
115	115
116	116	*)
...	...
...	...	@@ -79,7 +79,11 @@ static void V3270PrintSettings_init(V3270PrintSettings *widget)
79	79	};
80	80
81	81	size_t f;
82		- widget->font = v3270_font_selection_new("monospace");
	82	+ #ifdef __APPLE__
	83	+ widget->font = v3270_font_selection_new("Courier New");
	84	+ #else
	85	+ widget->font = v3270_font_selection_new("monospace");
	86	+ #endif
83	87	widget->color = v3270_color_scheme_new();
84	88	widget->selected = gtk_check_button_new_with_label( _("Print selection box") );
85	89
...	...
...	...	@@ -45,8 +45,10 @@ static const gchar * invalid_font_messages[] = {
45	45
46	46	const gchar * v3270_get_default_font_name()
47	47	{
48		-#ifdef _WIN32
	48	+#if defined(_WIN32)
49	49	return "Lucida Console";
	50	+#elif defined(__APPLE__)
	51	+ return "Courier New";
50	52	#else
51	53	return "monospace";
52	54	#endif // _WIN32
...	...