summaryrefslogtreecommitdiff
path: root/3rdparty
diff options
context:
space:
mode:
authorflaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-07-13 01:58:32 +0000
committerflaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-07-13 01:58:32 +0000
commitce4806100ca775d9086115f7f57beb0138f8c2f1 (patch)
tree6b48ef737da20ed3205feab7428b5455ae711f99 /3rdparty
parenta0383842abeb49c65c05832b51161dfaecc67fcb (diff)
downloadhercules-ce4806100ca775d9086115f7f57beb0138f8c2f1.tar.gz
hercules-ce4806100ca775d9086115f7f57beb0138f8c2f1.tar.bz2
hercules-ce4806100ca775d9086115f7f57beb0138f8c2f1.tar.xz
hercules-ce4806100ca775d9086115f7f57beb0138f8c2f1.zip
* CMake: added search for ws2_32 library. (tested with MinGW/MSYS)
* Added missing pcre library for MinGW. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14904 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to '3rdparty')
-rw-r--r--3rdparty/msinttypes/CMakeLists.txt2
-rw-r--r--3rdparty/pcre/lib/libpcre.dll.abin0 -> 19068 bytes
2 files changed, 1 insertions, 1 deletions
diff --git a/3rdparty/msinttypes/CMakeLists.txt b/3rdparty/msinttypes/CMakeLists.txt
index f7a662fe8..c11c1d72a 100644
--- a/3rdparty/msinttypes/CMakeLists.txt
+++ b/3rdparty/msinttypes/CMakeLists.txt
@@ -1,5 +1,5 @@
-if( WIN32 )
+if( MSVC )
find_path( MSINTTYPES_INCLUDE_DIRS "inttypes.h"
PATHS "${CMAKE_CURRENT_SOURCE_DIR}/include"
NO_DEFAULT_PATH )
diff --git a/3rdparty/pcre/lib/libpcre.dll.a b/3rdparty/pcre/lib/libpcre.dll.a
new file mode 100644
index 000000000..fe69e4e57
--- /dev/null
+++ b/3rdparty/pcre/lib/libpcre.dll.a
Binary files differ