Merge pull request #13 from pvpgn/master

Sync

.travis.yml

@@ -11,8 +11,8 @@ compiler: gcc
 before_install:
   - sudo apt-get update --fix-missing
   - sudo apt-get install build-essential zlib1g-dev libmysqlclient-dev liblua5.1-0-dev
-  - (cd /tmp && wget http://www.cmake.org/files/v3.3/cmake-3.3.2.tar.gz && tar zxf cmake-3.3.2.tar.gz)
-  - (cd /tmp/cmake-3.3.2 && cmake . && make && sudo make install) > /dev/null 2>&1
+  - (cd /tmp && wget --no-check-certificate https://cmake.org/files/v3.4/cmake-3.4.0.tar.gz && tar zxf cmake-3.4.0.tar.gz)
+  - (cd /tmp/cmake-3.4.0 && cmake . && make && sudo make install) > /dev/null 2>&1
   - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
   - sudo apt-get -qq update
   - sudo apt-get -qq install g++-5
@@ -24,4 +24,4 @@ script:
   - cmake -D WITH_MYSQL=true -D WITH_LUA=true ../
   - make
   - sudo make install
-  - sudo make uninstall
+  - sudo make uninstall

ConfigureChecks.cmake

@@ -16,6 +16,7 @@ include(CheckLibraryExists)
 include(CheckCXXCompilerFlag)
 include(CheckCXXSourceCompiles)
 include(CheckMkdirArgs)
+include(CheckIncludeFiles)
 
 # setup short variable path names
 set(BINDIR ${BIN_INSTALL_DIR})
@@ -113,9 +114,7 @@ message(STATUS "Checking optional POSIX/required SUS headers")
 check_include_file_cxx(sys/timeb.h HAVE_SYS_TIMEB_H)
 
 message(STATUS "Checking FreeBSD-based headers")
-if (HAVE_SYS_TYPES_H)
-check_include_file_cxx(sys/event.h HAVE_SYS_EVENT_H)
-endif()
+check_include_files("sys/types.h;sys/event.h" HAVE_SYS_EVENT_H)
 check_include_file_cxx(sys/param.h HAVE_SYS_PARAM_H)
 
 message(STATUS "Checking BSD headers")

conf/supportfile.conf.in

@@ -3,6 +3,7 @@
 
 IX86ver1.mpq
 ver-ix86-1.mpq
+ver-IX86-2.mpq
 PMACver1.mpq
 XMACver1.mpq
 bnserver-D2DV.ini

conf/versioncheck.conf.in

@@ -61,6 +61,18 @@
 
 # -=-=-=-=-=-=- Latest Versions -=-=-=-=-=-=- No Update Required -=-=-=-=-=-=-
 
+# Warcraft III - TFT (Expansion) 1.27a
+# Note: this version check is sent in both FT and ROC mode
+"B=454282227 C=2370009462 A=2264812340 4 A=A^S B=B-C C=C-A A=A+B" \
+ ver-IX86-2.mpq \
+ IX86 \
+ W3XP \
+ "war3.exe 02/11/16 22:40:40 514536" \
+ 0x0000001b \
+ 1.27.0.16 \
+ 0x5714f86e \
+ W3XP_127A
+
 # Warcraft III - TFT (Expansion) 1.26a
 # Note: this version check is sent in both FT and ROC mode
 "A=3845581634 B=880823580 C=1363937103 4 A=A-S B=B-C C=C-A A=A-B" \

files/CMakeLists.txt

@@ -19,6 +19,6 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/var/ DESTINATION ${LOCALSTATEDIR})
 
 install(FILES ad000001.png ad000001.smk ad000002.mng newbie.save
 	bnserver.ini bnserver-D2DV.ini bnserver-D2XP.ini bnserver-WAR3.ini
-	ver-ix86-1.mpq IX86ver1.mpq PMACver1.mpq XMACver1.mpq IX86ExtraWork.mpq
+	ver-ix86-1.mpq ver-IX86-2.mpq IX86ver1.mpq PMACver1.mpq XMACver1.mpq IX86ExtraWork.mpq
 	icons.bni icons-WAR3.bni
     DESTINATION ${LOCALSTATEDIR}/files)