1
0
Commit Graph

65 Commits

Author SHA1 Message Date
Mattes D
2f369d09b6 Fixed multiple mbedtls inclusion.
Ref.: #1880.
2015-05-03 10:01:19 +02:00
Mattes D
5cc8d82a23 cNetwork: Fixed compilation in out-of-source builds. 2015-01-22 20:12:53 +01:00
Mattes D
c7335255ac Excluded PolarSSL tests from MCS tests. 2015-01-22 20:12:44 +01:00
Mattes D
a8a7488b54 Added the libevent library. 2015-01-22 20:12:39 +01:00
Mattes D
52d307e3b0 CMake: Check libs in submodules before configuring.
This provides an early error message when someone forgets to init / update submodules.
2015-01-09 20:38:25 +01:00
Mattes D
65b5ae0aa2 CMake: Added a C++11 check for VS.
VS2010- cannot be used, VS2012 needs to have a 2012-CTP compiler installed, VS2013+ has all the features we need.
2014-11-02 08:09:22 +01:00
Mattes D
449d08cb3d Merged IniFile into main MCS sources. 2014-10-23 15:15:10 +02:00
Tycho
4f67ca4c0a Added MCServer_ prfix to env vars for versions 2014-09-10 18:08:50 +01:00
Tycho
27be179939 Added abilty to set build info
build info is displayed at startup
Fixes #1410
2014-09-10 16:07:00 +01:00
Tycho
562b2d1d1d Added workaround for clang version 2014-09-06 16:30:04 +01:00
Tycho
5fa206a420 bumped cmake version min and fixed clang support 2014-09-06 15:30:13 +01:00
Mattes D
7f7604a186 Fixed SQLiteCpp include paths for MSVC2010+. 2014-07-28 22:06:47 +02:00
madmaxoft
5fb5f6671f Fixed include directories for SQLiteCpp. 2014-07-28 20:16:24 +02:00
madmaxoft
036a8ff98e Added SQLiteCpp library.
This provides C++ wrappers for SQLite, making it safer to use in the C++ environment.
2014-07-28 19:59:53 +02:00
Mattes D
9d843405b2 Merge branch 'master' into LuaProxy 2014-07-01 15:07:12 +02:00
Mattes D
563f706422 Removed the md5 library, obsoleted by PolarSSL.
Fixes #1130.
2014-06-27 19:34:53 +02:00
madmaxoft
e96a774f59 Added the Lua Proxy DLL.
This builds the lua5.1.dll file on Windows, making it 64-bit if so required.
2014-06-24 14:48:18 +02:00
Tycho
77395b3739 Maybe coverage working? 2014-05-10 05:03:36 -07:00
Tycho
1d3ad6faa2 Added Testing capability 2014-04-27 12:25:03 -07:00
Tycho
e4c7aac1cc Prepended Travis to env vars 2014-03-10 13:52:13 -07:00
worktycho
0eea9eb998 Move env code part 2
Only just noticed I committed this on the wrong branch.
2014-03-07 20:16:16 +00:00
Tycho
761857bd01 Fixed comment 2014-02-16 05:55:37 -08:00
Tycho
f42ad4e9f7 can Now build ProtoProxy alongside MCServer 2014-02-16 04:30:45 -08:00
Tycho
2acf218700 Allow building MCADefrag at the same time as MCServer 2014-02-16 03:37:31 -08:00
Tycho
faa6456344 Added a seperate module for Setting flags 2014-02-15 15:17:58 -08:00
Tycho
f25597540d Added support to start up MCServer and then immediatly sut it down in travis 2014-02-05 10:10:45 -08:00
madmaxoft
45958cb835 Explicitly make chars signed at the compiler-level.
Should fix #640.
2014-02-04 23:43:40 +01:00
Tycho
bee7de25f1 Ensure -Wall is enabled 2014-02-04 11:15:41 -08:00
Tycho
6952b24e88 Changed it so std was actually set to c++11 in clang not gcc on OS X 2014-01-26 07:20:24 -08:00
Mattes D
f78a62a5e3 Merge pull request #575 from worktycho/GeneratingBenchmark
More Interfaces to decouple Generator from the rest of the code
2014-01-25 13:55:33 -08:00
Tiger Wang
17c949ea69 Removed unnecessary define 2014-01-24 13:53:19 +00:00
madmaxoft
eb9bebf755 Replacing CryptoPP with PolarSSL.
This is only the CMake modification to build with PolarSSL, the actual MCS code doesn't compile at all yet.
2014-01-22 22:19:33 +01:00
Tycho
2aa28ad6f4 First attempt at Compiling Generator seperatly 2014-01-19 12:50:07 -08:00
Tycho
80f2f21f4c Changed std to c++11 in clang to fix va_copy issues 2014-01-17 10:10:31 -08:00
madmaxoft
d67cd8dafc CMake: MSVC release builds use LTCG. 2014-01-15 13:54:06 +01:00
madmaxoft
20209750aa CMake: MSVC builds use static CRT.
We don't want to be dependent on the VC runtime.
2014-01-15 11:49:26 +01:00
madmaxoft
f31043a5e7 CMake: Release profile build inherits from Release, not Debug. 2014-01-14 11:05:57 +01:00
Tycho
9c669e9217 Added -march=native to linux targets 2014-01-13 10:13:09 -08:00
madmaxoft
180b9b9099 Merge branch master into CmakeMultiConfig. 2014-01-12 10:04:16 +01:00
Tycho
623146996a Fixed FreeBSD compilition 2014-01-07 05:08:58 -08:00
Tycho Bickerstaff
7076f8e73a fixed compiler warnings not being enabled in clang 2014-01-02 17:11:40 +00:00
Tycho Bickerstaff
c52a46a5e3 merged changes from upstream 2013-12-31 16:24:53 +00:00
madmaxoft
65417dd836 Fixed Linux configuration. 2013-12-29 12:45:03 +01:00
madmaxoft
24371cd7d1 CMake: profiling builds get correct commandlines in MSVC. 2013-12-28 22:46:23 +01:00
madmaxoft
11a3132e01 Added custom configurations for MSVC projects.
The DebugProfile and ReleaseProfile configurations add profiling capabilities to the respective build.
2013-12-28 22:11:52 +01:00
madmaxoft
b6bbba0cde CMake: Fixed mismatching library vs app builds. 2013-12-28 16:03:57 +01:00
madmaxoft
f5c013071e Lua is built statically on *nix. 2013-12-27 12:01:45 +01:00
madmaxoft
1cf6502be2 Made cmake compilation possible on Windows. 2013-12-27 11:51:08 +01:00
Tycho Bickerstaff
a71299c46b fixed rdynamic as its not acctually needed a cmake handles it, looks like the problem was caused by the linux linker accepting the option twice and the os x linker not 2013-12-22 15:41:01 +00:00
Tycho Bickerstaff
6d7b6ae9ca fixes for mac os x 2013-12-22 15:17:36 +00:00