Skip to content

Commit

Permalink
updated mingw32.patch
Browse files Browse the repository at this point in the history
  • Loading branch information
velnias75 committed Jan 2, 2015
1 parent b61af89 commit 2b3ae3b
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions mingw32.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff -uNr netmaumau-0.8.orig/configure.ac netmaumau-0.8/configure.ac
--- netmaumau-0.8.orig/configure.ac 2014-12-27 10:56:09.000000000 +0100
+++ netmaumau-0.8/configure.ac 2014-12-29 05:51:53.127324310 +0100
--- netmaumau-0.8.orig/configure.ac 2015-01-02 11:54:02.000000000 +0100
+++ netmaumau-0.8/configure.ac 2015-01-02 12:00:51.605090632 +0100
@@ -7,7 +7,7 @@
AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip tar-pax no-installinfo no-texinfo.tex])
AM_MAINTAINER_MODE
Expand All @@ -10,7 +10,7 @@ diff -uNr netmaumau-0.8.orig/configure.ac netmaumau-0.8/configure.ac
LT_LANG([Windows Resource])

AC_SUBST([BUILD_YEAR], [`date +%Y`])
@@ -139,7 +139,7 @@
@@ -140,7 +140,7 @@
AC_SUBST([SERVER_VERSION_MAJOR])
AC_SUBST([SERVER_VERSION_MINOR])

Expand All @@ -20,8 +20,8 @@ diff -uNr netmaumau-0.8.orig/configure.ac netmaumau-0.8/configure.ac
AC_DEFINE_UNQUOTED([SERVER_VERSION_MAJOR], [${SERVER_VERSION_MAJOR}], [server version major])
AC_DEFINE_UNQUOTED([SERVER_VERSION_MINOR], [${SERVER_VERSION_MINOR}], [server version minor])
diff -uNr netmaumau-0.8.orig/src/client/Makefile.am netmaumau-0.8/src/client/Makefile.am
--- netmaumau-0.8.orig/src/client/Makefile.am 2014-12-29 05:36:28.000000000 +0100
+++ netmaumau-0.8/src/client/Makefile.am 2014-12-29 05:51:53.127324310 +0100
--- netmaumau-0.8.orig/src/client/Makefile.am 2014-12-29 07:57:58.000000000 +0100
+++ netmaumau-0.8/src/client/Makefile.am 2015-01-02 12:00:51.615090391 +0100
@@ -16,7 +16,7 @@
connectionrejectedexception.cpp interceptederrorexception.cpp \
nonetmaumauserverexception.cpp playerlistexception.cpp protocolerrorexception.cpp \
Expand All @@ -32,8 +32,8 @@ diff -uNr netmaumau-0.8.orig/src/client/Makefile.am netmaumau-0.8/src/client/Mak
libnetmaumauclient_la_LIBADD = libnetmaumauclient_private.la ../common/libnetmaumaucommon.la

diff -uNr netmaumau-0.8.orig/src/common/Makefile.am netmaumau-0.8/src/common/Makefile.am
--- netmaumau-0.8.orig/src/common/Makefile.am 2014-12-29 05:36:28.000000000 +0100
+++ netmaumau-0.8/src/common/Makefile.am 2014-12-29 06:03:03.650947341 +0100
--- netmaumau-0.8.orig/src/common/Makefile.am 2014-12-29 07:57:59.000000000 +0100
+++ netmaumau-0.8/src/common/Makefile.am 2015-01-02 12:00:51.625090151 +0100
@@ -20,6 +20,6 @@
libnetmaumaucommon_la_CXXFLAGS = -I$(top_srcdir)/src/include
libnetmaumaucommon_la_SOURCES = abstractconnection.cpp abstractconnectionimpl.cpp \
Expand All @@ -44,9 +44,9 @@ diff -uNr netmaumau-0.8.orig/src/common/Makefile.am netmaumau-0.8/src/common/Mak
+libnetmaumaucommon_la_LDFLAGS = -static-libgcc -static-libstdc++ -no-undefined \
-version-info 1:$(SERVER_VERSION_MINOR):$(SERVER_VERSION_MAJOR)
diff -uNr netmaumau-0.8.orig/src/server/Makefile.am netmaumau-0.8/src/server/Makefile.am
--- netmaumau-0.8.orig/src/server/Makefile.am 2014-12-26 05:16:22.000000000 +0100
+++ netmaumau-0.8/src/server/Makefile.am 2014-12-29 05:51:53.127324310 +0100
@@ -35,6 +35,7 @@
--- netmaumau-0.8.orig/src/server/Makefile.am 2015-01-02 11:54:02.000000000 +0100
+++ netmaumau-0.8/src/server/Makefile.am 2015-01-02 12:00:51.625090151 +0100
@@ -37,6 +37,7 @@

nmm_server_CXXFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/common \
-I$(top_srcdir)/src/engine $(POPT_CFLAGS)
Expand All @@ -56,7 +56,7 @@ diff -uNr netmaumau-0.8.orig/src/server/Makefile.am netmaumau-0.8/src/server/Mak
nmm_server_LDADD = ../common/libnetmaumaucommon.la ../engine/libengine.la $(POPT_LIBS)
diff -uNr netmaumau-0.8.orig/src/test/Makefile.am netmaumau-0.8/src/test/Makefile.am
--- netmaumau-0.8.orig/src/test/Makefile.am 2014-12-26 05:16:22.000000000 +0100
+++ netmaumau-0.8/src/test/Makefile.am 2014-12-29 05:51:53.127324310 +0100
+++ netmaumau-0.8/src/test/Makefile.am 2015-01-02 12:00:51.625090151 +0100
@@ -28,7 +28,7 @@
-I$(top_srcdir)/src/engine
test_netmaumau_SOURCES = test_netmaumau.cpp testeventhandler.cpp
Expand Down

0 comments on commit 2b3ae3b

Please sign in to comment.