summary refs log tree commit diff stats
path: root/src/fe-gtk
diff options
context:
space:
mode:
authorBerke Viktor <bviktor@hexchat.org>2012-10-27 01:26:32 +0200
committerBerke Viktor <bviktor@hexchat.org>2012-10-27 01:26:32 +0200
commita98dc18d55947709e9350da79993bbe8e8cdfa28 (patch)
treea1af1defdc25564d1c6661a9402c08da2084f6ee /src/fe-gtk
parentaae8c393ed8a840823c4a124379662e36bee844e (diff)
Ignore generated config.h properly on Unix
Diffstat (limited to 'src/fe-gtk')
-rw-r--r--src/fe-gtk/fe-gtk.h4
-rw-r--r--src/fe-gtk/hexchat.rc2
-rw-r--r--src/fe-gtk/sexy-iso-codes.c4
-rw-r--r--src/fe-gtk/xtext.c4
4 files changed, 13 insertions, 1 deletions
diff --git a/src/fe-gtk/fe-gtk.h b/src/fe-gtk/fe-gtk.h
index f4188a01..313afc4b 100644
--- a/src/fe-gtk/fe-gtk.h
+++ b/src/fe-gtk/fe-gtk.h
@@ -1,4 +1,8 @@
+#ifdef WIN32
+#include "../../config-win32.h"
+#else
 #include "../../config.h"
+#endif
 
 #define DISPLAY_NAME "HexChat"
 
diff --git a/src/fe-gtk/hexchat.rc b/src/fe-gtk/hexchat.rc
index 62000013..da88747a 100644
--- a/src/fe-gtk/hexchat.rc
+++ b/src/fe-gtk/hexchat.rc
@@ -1,5 +1,5 @@
 #include <winver.h>

-#include "../../config.h"

+#include "../../config-win32.h"

 #include "../../resource.h"

 

 XC_ICON ICON "../../hexchat.ico"

diff --git a/src/fe-gtk/sexy-iso-codes.c b/src/fe-gtk/sexy-iso-codes.c
index 4b637c9f..1e963cc1 100644
--- a/src/fe-gtk/sexy-iso-codes.c
+++ b/src/fe-gtk/sexy-iso-codes.c
@@ -23,7 +23,11 @@
  *
  */
 
+#ifdef WIN32
+#include "../../config-win32.h"
+#else
 #include "../../config.h"
+#endif
 
 #include "sexy-iso-codes.h"
 
diff --git a/src/fe-gtk/xtext.c b/src/fe-gtk/xtext.c
index 656a4c92..62cb0776 100644
--- a/src/fe-gtk/xtext.c
+++ b/src/fe-gtk/xtext.c
@@ -50,7 +50,11 @@
 #include <gtk/gtkwindow.h>
 
 #ifdef XCHAT
+#ifdef WIN32
+#include "../../config-win32.h"
+#else
 #include "../../config.h"			/* can define USE_XLIB here */
+#endif
 #else
 #define USE_XLIB
 #endif