fix windows build

mattn · Apr 28, 2016 · 8e7e220 · 8e7e220
1 parent c7fef98
commit 8e7e220
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 73 deletions.
diff --git a/Makefile.w32 b/Makefile.w32
@@ -1,13 +1,6 @@
 PACKAGE_VERSION=$(shell cat VERSION)
-CFLAGS=-g -Wall -std=gnu99 -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" \
-  -mms-bitfields -Ic:/gtk/include/gtk-2.0 -Ic:/gtk/lib/gtk-2.0/include -Ic:/gtk/include/atk-1.0 -Ic:/gtk/include/cairo -Ic:/gtk/include/pango-1.0 -Ic:/gtk/include/glib-2.0 -Ic:/gtk/lib/glib-2.0/include -Ic:/gtk/include/freetype2 -Ic:/gtk/include -Ic:/gtk/include/libpng14 -Ic:/gtk/include/libxml2 \
-  -Ic:/openssl-win32/include
-LDFLAGS=-Lc:/gtk/lib \
-  -Lc:/gtk/lib -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgio-2.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lxml2 -lgthread-2.0 -lglib-2.0 -lws2_32 -lintl \
-  -Lc:/openssl-win32/lib/mingw \
-  -leay32 \
-  -lshell32 \
-  -lsqlite3
+CFLAGS=-g -Wall -std=gnu99 -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" `pkg-config --cflags gtk+-2.0`
+LDFLAGS=`pkg-config --libs gtk+-2.0 gmodule-2.0` -lshell32 -lsqlite3 -lcrypto -lws2_32
 
 all : gol.exe displays
 

diff --git a/display/balloon/Makefile.w32 b/display/balloon/Makefile.w32
@@ -1,17 +1,6 @@
 PACKAGE_VERSION=$(shell cat ../../VERSION)
-CFLAGS=-g -Wall -std=gnu99 -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" \
-  -mms-bitfields -Ic:/gtk/include/gtk-2.0 -Ic:/gtk/lib/gtk-2.0/include -Ic:/gtk/include/atk-1.0 -Ic:/gtk/include/cairo -Ic:/gtk/include/pango-1.0 -Ic:/gtk/include/glib-2.0 -Ic:/gtk/lib/glib-2.0/include -Ic:/gtk/include/freetype2 -Ic:/gtk/include -Ic:/gtk/include/libpng14 -Ic:/gtk/include/libxml2 \
-  -Ic:/openssl-win32/include \
-  -I../..
-LDFLAGS=-Lc:/gtk/lib \
-  -L../../plugins \
-  -lgolplug \
-  -Lc:/gtk/lib -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgio-2.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lxml2 -lgthread-2.0 -lglib-2.0 -lws2_32 -lintl \
-  -Lc:/openssl-win32/lib/mingw \
-  -leay32 \
-  -lshell32 \
-  -lsqlite3 \
-  -lcurldll
+CFLAGS=-g -Wall -std=gnu99 -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" `pkg-config --cflags gtk+-2.0` -I../..
+LDFLAGS=-L../../plugins -lgolplug `pkg-config --libs gtk+-2.0 gmodule-2.0` -lshell32 -lsqlite3 -lcrypto -lws2_32 -lcurl
 
 all : libballoon.dll
 

diff --git a/display/fog/Makefile.w32 b/display/fog/Makefile.w32
@@ -1,17 +1,6 @@
-PACKAGE_VERSION=$(shell cat ../../VERSION)
-CFLAGS=-g -Wall -std=gnu99 -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" \
-  -mms-bitfields -Ic:/gtk/include/gtk-2.0 -Ic:/gtk/lib/gtk-2.0/include -Ic:/gtk/include/atk-1.0 -Ic:/gtk/include/cairo -Ic:/gtk/include/pango-1.0 -Ic:/gtk/include/glib-2.0 -Ic:/gtk/lib/glib-2.0/include -Ic:/gtk/include/freetype2 -Ic:/gtk/include -Ic:/gtk/include/libpng14 -Ic:/gtk/include/libxml2 \
-  -Ic:/openssl-win32/include \
-  -I../..
-LDFLAGS=-Lc:/gtk/lib \
-  -L../../plugins \
-  -lgolplug \
-  -Lc:/gtk/lib -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgio-2.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lxml2 -lgthread-2.0 -lglib-2.0 -lws2_32 -lintl \
-  -Lc:/openssl-win32/lib/mingw \
-  -leay32 \
-  -lshell32 \
-  -lsqlite3 \
-  -lcurldll
+PACKAGE_VERSION=$(shell cat VERSION)
+CFLAGS=-g -Wall -std=gnu99 -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" `pkg-config --cflags gtk+-2.0` -I../..
+LDFLAGS=-L../../plugins -lgolplug `pkg-config --libs gtk+-2.0 gmodule-2.0` -lshell32 -lsqlite3 -lcrypto -lws2_32 -lcurl
 
 all : libfog.dll
 

diff --git a/display/msagent/Makefile.w32 b/display/msagent/Makefile.w32
@@ -1,17 +1,6 @@
 PACKAGE_VERSION=$(shell cat ../../VERSION)
-CFLAGS=-g -Wall -std=c99 -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" \
-  -mms-bitfields -Ic:/gtk/include/gtk-2.0 -Ic:/gtk/lib/gtk-2.0/include -Ic:/gtk/include/atk-1.0 -Ic:/gtk/include/cairo -Ic:/gtk/include/pango-1.0 -Ic:/gtk/include/glib-2.0 -Ic:/gtk/lib/glib-2.0/include -Ic:/gtk/include/freetype2 -Ic:/gtk/include -Ic:/gtk/include/libpng14 -Ic:/gtk/include/libxml2 \
-  -Ic:/openssl-win32/include \
-  -I../..
-LDFLAGS=-Lc:/gtk/lib \
-  -L../../plugins \
-  -lgolplug \
-  -Lc:/gtk/lib -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgio-2.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lxml2 -lgthread-2.0 -lglib-2.0 -lws2_32 -lintl \
-  -Lc:/openssl-win32/lib/mingw \
-  -leay32 \
-  -lshell32 \
-  -lsqlite3 \
-  -lcurldll
+CFLAGS=-g -Wall -std=gnu99 -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" `pkg-config --cflags gtk+-2.0` -I../..
+LDFLAGS=-L../../plugins -lgolplug `pkg-config --libs gtk+-2.0 gmodule-2.0` -lshell32 -lsqlite3 -lcrypto -lws2_32 -lcurl
 
 all : libmsagent.dll
 

diff --git a/display/nico2/Makefile.w32 b/display/nico2/Makefile.w32
@@ -1,17 +1,6 @@
 PACKAGE_VERSION=$(shell cat ../../VERSION)
-CFLAGS=-g -Wall -std=gnu99 -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" \
-  -mms-bitfields -Ic:/gtk/include/gtk-2.0 -Ic:/gtk/lib/gtk-2.0/include -Ic:/gtk/include/atk-1.0 -Ic:/gtk/include/cairo -Ic:/gtk/include/pango-1.0 -Ic:/gtk/include/glib-2.0 -Ic:/gtk/lib/glib-2.0/include -Ic:/gtk/include/freetype2 -Ic:/gtk/include -Ic:/gtk/include/libpng14 -Ic:/gtk/include/libxml2 \
-  -Ic:/openssl-win32/include \
-  -I../..
-LDFLAGS=-Lc:/gtk/lib \
-  -L../../plugins \
-  -lgolplug \
-  -Lc:/gtk/lib -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgio-2.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lxml2 -lgthread-2.0 -lglib-2.0 -lws2_32 -lintl \
-  -Lc:/openssl-win32/lib/mingw \
-  -leay32 \
-  -lshell32 \
-  -lsqlite3 \
-  -lcurldll
+CFLAGS=-g -Wall -std=gnu99 -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" `pkg-config --cflags gtk+-2.0` -I../..
+LDFLAGS=-L../../plugins -lgolplug `pkg-config --libs gtk+-2.0 gmodule-2.0` -lshell32 -lsqlite3 -lcrypto -lws2_32 -lcurl
 
 all : libnico2.dll
 

diff --git a/plugins/Makefile.w32 b/plugins/Makefile.w32
@@ -1,15 +1,6 @@
 PACKAGE_VERSION=$(shell cat ../VERSION)
-CFLAGS=-g -Wall -std=gnu99 -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" \
-  -mms-bitfields -Ic:/gtk/include/gtk-2.0 -Ic:/gtk/lib/gtk-2.0/include -Ic:/gtk/include/atk-1.0 -Ic:/gtk/include/cairo -Ic:/gtk/include/pango-1.0 -Ic:/gtk/include/glib-2.0 -Ic:/gtk/lib/glib-2.0/include -Ic:/gtk/include/freetype2 -Ic:/gtk/include -Ic:/gtk/include/libpng14 -Ic:/gtk/include/libxml2 \
-  -Ic:/openssl-win32/include \
-  -I..
-LDFLAGS=-Lc:/gtk/lib \
-  -Lc:/gtk/lib -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgio-2.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lxml2 -lgthread-2.0 -lglib-2.0 -lws2_32 -lintl \
-  -Lc:/openssl-win32/lib/mingw \
-  -leay32 \
-  -lshell32 \
-  -lsqlite3 \
-  -lcurldll
+CFLAGS=-g -Wall -std=gnu99 -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" `pkg-config --cflags gtk+-2.0` -I..
+LDFLAGS=`pkg-config --libs gtk+-2.0 gmodule-2.0` -lshell32 -lsqlite3 -lcurl -lcrypto -lws2_32
 
 all: libgolplug.a