diff --git a/src/shared/Database/SqlOperations.cpp b/src/shared/Database/SqlOperations.cpp index d47e85d67..f707dd1f2 100644 --- a/src/shared/Database/SqlOperations.cpp +++ b/src/shared/Database/SqlOperations.cpp @@ -107,7 +107,7 @@ bool SqlQueryHolder::SetQuery(size_t index, const char *sql) } /// not executed yet, just stored (it's not called a holder for nothing) - m_queries[index] = SqlResultPair(strdup(sql), NULL); + m_queries[index] = SqlResultPair(strdup(sql), (QueryResult*)NULL); return true; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 94cfd8425..77cf726ce 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8713" + #define REVISION_NR "8714" #endif // __REVISION_NR_H__ diff --git a/win/VC100/ACE_vc10.vcxproj b/win/VC100/ACE_vc10.vcxproj index 209c989fd..ddcb5a69d 100644 --- a/win/VC100/ACE_vc10.vcxproj +++ b/win/VC100/ACE_vc10.vcxproj @@ -1,4 +1,5 @@ - + + Debug_NoPCH @@ -196,7 +197,7 @@ true Level3 ProgramDatabase - 4355;%(DisableSpecificWarnings) + 4355;4244;%(DisableSpecificWarnings) _DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions) @@ -269,7 +270,7 @@ MultiThreadedDLL true Level3 - 4355;%(DisableSpecificWarnings) + 4355;4244;%(DisableSpecificWarnings) NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions) @@ -348,7 +349,7 @@ true Level3 ProgramDatabase - 4355;%(DisableSpecificWarnings) + 4355;4244;%(DisableSpecificWarnings) _DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions) diff --git a/win/VC100/mangosd.vcxproj b/win/VC100/mangosd.vcxproj index 4c2cbd38a..77325676c 100644 --- a/win/VC100/mangosd.vcxproj +++ b/win/VC100/mangosd.vcxproj @@ -1,4 +1,5 @@ - + + Debug_NoPCH @@ -187,7 +188,7 @@ false - $(OutDir)mangosd.lib + $(IntDir)mangosd.lib copy ..\..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\..\bin\$(Platform)_$(Configuration) @@ -236,7 +237,7 @@ false - $(OutDir)mangosd.lib + $(IntDir)mangosd.lib MachineX64 @@ -288,7 +289,7 @@ false - $(OutDir)mangosd.lib + $(IntDir)mangosd.lib copy ..\..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\..\bin\$(Platform)_$(Configuration) @@ -338,7 +339,7 @@ false - $(OutDir)mangosd.lib + $(IntDir)mangosd.lib MachineX64 @@ -390,7 +391,7 @@ false - $(OutDir)mangosd.lib + $(IntDir)mangosd.lib copy ..\..\dep\lib\$(Platform)_debug\*.dll ..\..\bin\$(Platform)_$(Configuration) @@ -440,7 +441,7 @@ false - $(OutDir)mangosd.lib + $(IntDir)mangosd.lib MachineX64 diff --git a/win/VC100/script.vcxproj b/win/VC100/script.vcxproj index 0f4ee5460..13ff773cd 100644 --- a/win/VC100/script.vcxproj +++ b/win/VC100/script.vcxproj @@ -1,4 +1,5 @@ - + + Debug_NoPCH @@ -161,7 +162,7 @@ false - $(OutDir)MaNGOSScript.lib + $(IntDir)MaNGOSScript.lib MachineX86 @@ -192,7 +193,7 @@ false - $(OutDir)MaNGOSScript.lib + $(IntDir)MaNGOSScript.lib MachineX64 @@ -219,7 +220,7 @@ false - $(OutDir)MaNGOSScript.lib + $(IntDir)MaNGOSScript.lib MachineX86 @@ -249,7 +250,7 @@ false - $(OutDir)MaNGOSScript.lib + $(IntDir)MaNGOSScript.lib MachineX64 @@ -277,7 +278,7 @@ false - $(OutDir)MaNGOSScript.lib + $(IntDir)MaNGOSScript.lib MachineX86 @@ -308,7 +309,7 @@ false - $(OutDir)MaNGOSScript.lib + $(IntDir)MaNGOSScript.lib MachineX64