Skip to content
Browse files

[mr3008] fix wrong expression from 2997 - in *nix SYSCONFDIR setted f…

…rom command line (possible in win also, but don't sure). with 2997 core cannot find ahbot.conf/scriptdev2.conf
  • Loading branch information...
1 parent 83797c5 commit a24404bddde12807544bf4e096b63cddd1d53bf6 @rsa rsa committed Oct 13, 2013
Showing with 7 additions and 5 deletions.
  1. +6 −4 CMakeLists.txt
  2. +1 −1 src/shared/revision_R2.h
View
10 CMakeLists.txt
@@ -407,10 +407,12 @@ add_subdirectory(dep) # TODO: add vmap extractor build support
# Add definitions for all build types
# Don't place this above 'dep' subdirectory! Because of defines build will crash.
-set(DEFINITIONS
- DO_MYSQL
- SYSCONFDIR="../etc/"
-)
+if (UNIX)
+ set(DEFINITIONS DO_MYSQL SYSCONFDIR="${CONF_DIR}/")
+else()
+ set(DEFINITIONS DO_MYSQL SYSCONFDIR="../etc/")
+endif()
+
set(DEFINITIONS_RELEASE NDEBUG)
set(DEFINITIONS_DEBUG _DEBUG MANGOS_DEBUG)
if(WIN32)
View
2 src/shared/revision_R2.h
@@ -1,4 +1,4 @@
#ifndef __REVISION_R2_H__
#define __REVISION_R2_H__
- #define REVISION_R2 "3007"
+ #define REVISION_R2 "3008"
#endif // __REVISION_R2_H__

1 comment on commit a24404b

@FallenAngelX

havent tested with this commit but on new builds with server fastmm.dll and ahbot.config never installed when using cmake instal option on windows

Please sign in to comment.
Something went wrong with that request. Please try again.