Corysia Taware
f6046477b4
Changes for intel Mac OSX build
2014-04-03 14:10:03 -07:00
Dmitry Marakasov
7ee417ab05
Simplify conditional linking with libdl
2013-10-09 19:27:52 +04:00
j883376
0578f45490
Revert "Revert "Merge pull request #77 from j883376/cleanups""
...
This reverts commit d25205d9d381dc83d610fa1084019b90cfe83e1c.
2013-06-28 04:25:44 -04:00
KimLS
d25205d9d3
Revert "Merge pull request #77 from j883376/cleanups"
...
This reverts commit 4ff2efea435a235b634904c91381334ce2d38e4b, reversing
changes made to e811e3975b3e6f5f1c3274a501b6f964925281fb.
2013-06-27 12:50:20 -07:00
j883376
536e31d771
Change binary output path to use CMake variable
...
Tools that use CMake's EXECUTABLE_OUTPUT_PATH variable to
determine which binary to launch for debugging may be confused
by a relative path, so use CMake variable PROJECT_BINARY_DIR
instead.
2013-06-21 23:21:57 -04:00
j883376
2a39449f6e
Fix exit code values
...
- Change all exit codes to match the standard of 0 for success
and 1 for error
- Add empty shared folder to utils/defaults for shared_memory
2013-06-21 22:54:28 -04:00
j883376
b47597b813
Merge branch 'master' of git://github.com/EQEmu/Server into gcc-changes
2013-05-23 21:12:07 -04:00
KimLS
efe7092995
Merge and a few cleanup / bug fixes
2013-05-23 12:35:00 -07:00
KimLS
e6fba5ba82
Merging
2013-05-23 00:31:02 -07:00
Arthur Ice
5255c236c3
added std:: to a lot of locations which where
...
missed and added NOMINMAX to cmakelist
2013-05-22 23:55:49 -07:00
Arthur Ice
ea2a1651d5
Merge branch 'master' into StringFormatting
...
Conflicts:
common/debug.cpp
2013-05-22 18:07:39 -07:00
Michael Cook
0fdfe025cb
Remove 'using namespaces std' fixes #61
2013-05-22 16:17:19 -04:00
Arthur Ice
f1a487f606
Merge branch 'master' into StringFormatting.
...
Cleaned up the problems. Tested on Linux. Still need to test on windows.
Conflicts:
common/CMakeLists.txt
common/MiscFunctions.cpp
common/MiscFunctions.h
common/debug.cpp
world/Adventure.cpp
2013-05-19 18:56:21 -07:00
j883376
f51f6e00c4
Add install paths to CMakeLists
2013-05-15 17:04:08 -04:00
KimLS
9e13a2271c
Merge conflicts
2013-05-15 13:22:46 -07:00
Michael Cook
73a4e87379
FreeBSD support and clean up of unnecessary ifdef FREEBSD
2013-05-11 14:32:14 -04:00
Arthur Ice
373ff66240
moved string functions from MiscFunctions to StringUtil
2013-05-11 00:05:11 -07:00
j883376
4bdd8b2502
Change space indentation to tabs
2013-05-09 11:37:51 -04:00
j883376
ffcff4aea1
Remove trailing whitespace
2013-05-09 11:13:16 -04:00
Arthur Ice
7560b6b0a7
NULL to nullptr
2013-05-04 18:06:58 -07:00
SecretsOTheP
cabf8631d4
Fixed mercenary memleaks in AI_Start and Unsuspend.
2013-03-20 04:00:08 -04:00
KimLS
ef9498b03a
Got rid of rules global (ugh) and gonna start work on items loading next
2013-02-20 15:35:46 -08:00
KimLS
da7347f76f
svn -> git Migration
2013-02-16 16:14:39 -08:00
