mirror of
https://gitcode.com/GitHub_Trending/az/azerothcore-wotlk.git
synced 2026-07-11 03:13:10 +00:00
Project restructuring [PART.2]
This commit is contained in:
Yehonal
@@ -1,17 +0,0 @@
|
||||
CU_RUN_HOOK("BEFORE_ACORE_LOAD")
|
||||
|
||||
add_subdirectory(deps)
|
||||
|
||||
if( SERVERS )
|
||||
add_subdirectory(framework)
|
||||
add_subdirectory(world-engine/collision)
|
||||
else()
|
||||
if( TOOLS )
|
||||
add_subdirectory(extractors)
|
||||
add_subdirectory(world-engine/collision)
|
||||
add_subdirectory(framework)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
CU_RUN_HOOK("AFTER_ACORE_LOAD")
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
file(GLOB_RECURSE sources *.cpp *.h)
|
||||
|
||||
set(include_Dirs
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/loadlib
|
||||
)
|
||||
@@ -21,7 +21,7 @@ set(include_Dirs
|
||||
if( WIN32 )
|
||||
set(include_Dirs
|
||||
${include_Dirs}
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq/win
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -13,11 +13,11 @@ file(GLOB_RECURSE meshExtract_Sources *.cpp *.h)
|
||||
|
||||
set(include_Base
|
||||
${CMAKE_BINARY_DIR}
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Recast
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Detour
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/g3dlite/include
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Recast
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include
|
||||
${ACE_INCLUDE_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
)
|
||||
@@ -25,7 +25,7 @@ set(include_Base
|
||||
if( WIN32 )
|
||||
set(include_Base
|
||||
${include_Base}
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq/win
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -15,29 +15,29 @@ set(mmap_gen_Includes
|
||||
${ACE_INCLUDE_DIR}
|
||||
${MYSQL_INCLUDE_DIR}
|
||||
${OPENSSL_INCLUDE_DIR}
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/bzip2
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/g3dlite/include
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Recast
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Detour
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Management
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Maps
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Models
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/Configuration
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/Cryptography
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/Cryptography/Authentication
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/Database
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/DataStores
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/Debugging
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/Dynamic/LinkedReference
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/Dynamic
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/Logging
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/Packets
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/Threading
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/Utilities
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/bzip2
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Recast
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Management
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Maps
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Models
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Configuration
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography/Authentication
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/DataStores
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic/LinkedReference
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Logging
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities
|
||||
${CMAKE_SOURCE_DIR}/src/game
|
||||
${CMAKE_SOURCE_DIR}/src/game/Accounts
|
||||
${CMAKE_SOURCE_DIR}/src/game/Achievements
|
||||
@@ -111,7 +111,7 @@ set(mmap_gen_Includes
|
||||
if( WIN32 )
|
||||
set(mmap_gen_Includes
|
||||
${mmap_gen_Includes}
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq/win
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
include_directories(
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/g3dlite/include
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/Debugging
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Maps
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Models
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Maps
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Models
|
||||
${ACE_INCLUDE_DIR}
|
||||
${ZLIB_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
file(GLOB_RECURSE sources *.cpp *.h)
|
||||
|
||||
set(include_Dirs
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq
|
||||
)
|
||||
|
||||
if( WIN32 )
|
||||
set(include_Dirs
|
||||
${include_Dirs}
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq/win
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -328,9 +328,9 @@ if (USE_COREPCH)
|
||||
endif()
|
||||
|
||||
include_directories(
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/acelite
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/acelite
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
|
||||
)
|
||||
|
||||
# Needed for PCH support
|
||||
|
||||
@@ -15,7 +15,7 @@ set(bzip2_STAT_SRCS
|
||||
)
|
||||
|
||||
include_directories(
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
)
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ set(g3dlib_STAT_SRCS
|
||||
if(WIN32)
|
||||
include_directories(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/include
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
|
||||
)
|
||||
else()
|
||||
include_directories(
|
||||
|
||||
@@ -30,7 +30,7 @@ public:
|
||||
/** \brief Returns true if the intersection of the ray and the solid box is non-empty.
|
||||
|
||||
\cite "Fast Ray / Axis-Aligned Bounding Box Overlap Tests using Ray Slopes"
|
||||
by Martin Eisemann, Thorsten Grosch, Stefan Müller and Marcus Magnor
|
||||
by Martin Eisemann, Thorsten Grosch, Stefan M�ller and Marcus Magnor
|
||||
Computer Graphics Lab, TU Braunschweig, Germany and
|
||||
University of Koblenz-Landau, Germany
|
||||
*/
|
||||
@@ -43,7 +43,7 @@ public:
|
||||
\a time is not set if there is no intersection.
|
||||
|
||||
\cite Slope-Mul method from "Fast Ray / Axis-Aligned Bounding Box Overlap Tests using Ray Slopes"
|
||||
by Martin Eisemann, Thorsten Grosch, Stefan Müller and Marcus Magnor
|
||||
by Martin Eisemann, Thorsten Grosch, Stefan M�ller and Marcus Magnor
|
||||
Computer Graphics Lab, TU Braunschweig, Germany and
|
||||
University of Koblenz-Landau, Germany
|
||||
*/
|
||||
|
||||
@@ -312,7 +312,7 @@ public:
|
||||
// "You might be tempted to write [...] them as inline functions
|
||||
// inside their respective header files, but this is something you
|
||||
// must definitely not do. An inline function can be duplicated
|
||||
// in every file in which it appears œóõ½ and this duplication
|
||||
// in every file in which it appears ���� and this duplication
|
||||
// includes the static object definition. Because inline functions
|
||||
// automatically default to internal linkage, this would result in
|
||||
// having multiple static objects across the various translation
|
||||
|
||||
@@ -36,7 +36,7 @@ private:
|
||||
|
||||
// The following are for the "ray slope" optimization from
|
||||
// "Fast Ray / Axis-Aligned Bounding Box Overlap Tests using Ray Slopes"
|
||||
// by Martin Eisemann, Thorsten Grosch, Stefan Müller and Marcus Magnor
|
||||
// by Martin Eisemann, Thorsten Grosch, Stefan M�ller and Marcus Magnor
|
||||
// Computer Graphics Lab, TU Braunschweig, Germany and
|
||||
// University of Koblenz-Landau, Germany*/
|
||||
enum Classification {MMM, MMP, MPM, MPP, PMM, PMP, PPM, PPP, POO, MOO, OPO, OMO, OOP, OOM, OMM, OMP, OPM, OPP, MOM, MOP, POM, POP, MMO, MPO, PMO, PPO}; Classification classification;
|
||||
|
||||
@@ -2267,7 +2267,7 @@ bool CollisionDetection::fixedSolidSphereIntersectsFixedTriangle(
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// AABB-triangle overlap test code based on Tomas Akenine-M�öller's
|
||||
// AABB-triangle overlap test code based on Tomas Akenine-M��ller's
|
||||
// http://www.cs.lth.se/home/Tomas_Akenine_Moller/code/tribox3.txt
|
||||
// Ported 2008-12-28
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ std::string license() {
|
||||
"%s"
|
||||
"This program uses the G3D Library (http://g3d.sf.net), which\n"
|
||||
"is licensed under the \"Modified BSD\" Open Source license. The G3D library\n"
|
||||
"source code is Copyright © 2000-2010, Morgan McGuire, All rights reserved.\n"
|
||||
"source code is Copyright � 2000-2010, Morgan McGuire, All rights reserved.\n"
|
||||
"This program uses The OpenGL Extension Wrangler Library, which \n"
|
||||
"is licensed under the \"Modified BSD\" Open Source license. \n"
|
||||
"The OpenGL Extension Wrangler Library source code is\n"
|
||||
|
||||
@@ -19,7 +19,7 @@ endif()
|
||||
|
||||
# Create the header, so we can use it
|
||||
configure_file(
|
||||
"${CMAKE_SOURCE_DIR}/modules/acore/deps/jemalloc/jemalloc_defs.h.in.cmake"
|
||||
"${CMAKE_SOURCE_DIR}/modules/worldengine/deps/jemalloc/jemalloc_defs.h.in.cmake"
|
||||
"${BUILDDIR}/jemalloc_defs.h"
|
||||
@ONLY
|
||||
)
|
||||
|
||||
@@ -17,15 +17,15 @@ set(mpq_STAT_SRCS
|
||||
if( UNIX )
|
||||
include_directories(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/bzip2
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/bzip2
|
||||
)
|
||||
elseif( WIN32 )
|
||||
include_directories(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/win
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/bzip2
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/bzip2
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -54,7 +54,7 @@ include_directories(
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${CMAKE_BINARY_DIR}
|
||||
${OPENSSL_INCLUDE_DIR}
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/include
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/include/internal
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dbug
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
solution was needed than the one-to-one conversion table. To
|
||||
note a few, here is an example of a Czech sorting sequence:
|
||||
|
||||
co < hlaska < hláska < hlava < chlapec < krtek
|
||||
co < hlaska < hl�ska < hlava < chlapec < krtek
|
||||
|
||||
It because some of the rules are: double char 'ch' is sorted
|
||||
between 'h' and 'i'. Accented character 'á' (a with acute) is
|
||||
between 'h' and 'i'. Accented character '�' (a with acute) is
|
||||
sorted after 'a' and before 'b', but only if the word is
|
||||
otherwise the same. However, because 's' is sorted before 'v'
|
||||
in hlava, the accentness of 'á' is overridden. There are many
|
||||
in hlava, the accentness of '�' is overridden. There are many
|
||||
more rules.
|
||||
|
||||
This file defines functions my_strxfrm and my_strcoll for
|
||||
@@ -138,30 +138,30 @@ static struct wordvalue doubles[] = {
|
||||
|
||||
We append 0 to the end.
|
||||
---
|
||||
Neformální popis algoritmu:
|
||||
Neform�ln� popis algoritmu:
|
||||
|
||||
Procházíme øetìzec zleva doprava.
|
||||
Proch�z�me �et�zec zleva doprava.
|
||||
|
||||
Konec øetìzce je pøedán buï jako parametr, nebo je to *p == 0.
|
||||
Toto je o¹etøeno makrem IS_END.
|
||||
Konec �et�zce je p�ed�n bu� jako parametr, nebo je to *p == 0.
|
||||
Toto je o�et�eno makrem IS_END.
|
||||
|
||||
Pokud jsme do¹li na konec øetìzce pøi prùchodu 0, nejdeme na
|
||||
zaèátek, ale na ulo¾enou pozici, proto¾e první a druhý prùchod
|
||||
bì¾í souèasnì.
|
||||
Pokud jsme do�li na konec �et�zce p�i pr�chodu 0, nejdeme na
|
||||
za��tek, ale na ulo�enou pozici, proto�e prvn� a druh� pr�chod
|
||||
b��� sou�asn�.
|
||||
|
||||
Konec vstupu (prùchodu) oznaèíme na výstupu hodnotou 1.
|
||||
Konec vstupu (pr�chodu) ozna��me na v�stupu hodnotou 1.
|
||||
|
||||
Pro ka¾dý znak øetìzce naèteme hodnotu z tøídící tabulky.
|
||||
Pro ka�d� znak �et�zce na�teme hodnotu z t��d�c� tabulky.
|
||||
|
||||
Jde-li o hodnotu ignorovat (0), skoèíme ihned na dal¹í znak..
|
||||
Jde-li o hodnotu ignorovat (0), sko��me ihned na dal�� znak..
|
||||
|
||||
Jde-li o hodnotu konec slova (2) a je to prùchod 0 nebo 1,
|
||||
pøeskoèíme v¹echny dal¹í 0 -- 2 a prohodíme prùchody.
|
||||
Jde-li o hodnotu konec slova (2) a je to pr�chod 0 nebo 1,
|
||||
p�esko��me v�echny dal�� 0 -- 2 a prohod�me pr�chody.
|
||||
|
||||
Jde-li o kompozitní znak (255), otestujeme, zda následuje
|
||||
správný do dvojice, dohledáme správnou hodnotu.
|
||||
Jde-li o kompozitn� znak (255), otestujeme, zda n�sleduje
|
||||
spr�vn� do dvojice, dohled�me spr�vnou hodnotu.
|
||||
|
||||
Na konci pøipojíme znak 0
|
||||
Na konci p�ipoj�me znak 0
|
||||
*/
|
||||
|
||||
#define ADD_TO_RESULT(dest, len, totlen, value) \
|
||||
@@ -315,24 +315,24 @@ static size_t my_strnxfrm_czech(CHARSET_INFO *cs __attribute__((unused)),
|
||||
|
||||
|
||||
/*
|
||||
Neformální popis algoritmu:
|
||||
Neform�ln� popis algoritmu:
|
||||
|
||||
procházíme øetìzec zleva doprava
|
||||
konec øetìzce poznáme podle *p == 0
|
||||
pokud jsme do¹li na konec øetìzce pøi prùchodu 0, nejdeme na
|
||||
zaèátek, ale na ulo¾enou pozici, proto¾e první a druhý
|
||||
prùchod bì¾í souèasnì
|
||||
konec vstupu (prùchodu) oznaèíme na výstupu hodnotou 1
|
||||
proch�z�me �et�zec zleva doprava
|
||||
konec �et�zce pozn�me podle *p == 0
|
||||
pokud jsme do�li na konec �et�zce p�i pr�chodu 0, nejdeme na
|
||||
za��tek, ale na ulo�enou pozici, proto�e prvn� a druh�
|
||||
pr�chod b��� sou�asn�
|
||||
konec vstupu (pr�chodu) ozna��me na v�stupu hodnotou 1
|
||||
|
||||
naèteme hodnotu z tøídící tabulky
|
||||
jde-li o hodnotu ignorovat (0), skoèíme na dal¹í prùchod
|
||||
jde-li o hodnotu konec slova (2) a je to prùchod 0 nebo 1,
|
||||
pøeskoèíme v¹echny dal¹í 0 -- 2 a prohodíme
|
||||
prùchody
|
||||
jde-li o kompozitní znak (255), otestujeme, zda následuje
|
||||
správný do dvojice, dohledáme správnou hodnotu
|
||||
na�teme hodnotu z t��d�c� tabulky
|
||||
jde-li o hodnotu ignorovat (0), sko��me na dal�� pr�chod
|
||||
jde-li o hodnotu konec slova (2) a je to pr�chod 0 nebo 1,
|
||||
p�esko��me v�echny dal�� 0 -- 2 a prohod�me
|
||||
pr�chody
|
||||
jde-li o kompozitn� znak (255), otestujeme, zda n�sleduje
|
||||
spr�vn� do dvojice, dohled�me spr�vnou hodnotu
|
||||
|
||||
na konci pøipojíme znak 0
|
||||
na konci p�ipoj�me znak 0
|
||||
*/
|
||||
|
||||
|
||||
|
||||
@@ -456,19 +456,19 @@ CHARSET_INFO my_charset_latin1=
|
||||
*
|
||||
* The modern sort order is used, where:
|
||||
*
|
||||
* 'ä' -> "ae"
|
||||
* 'ö' -> "oe"
|
||||
* 'ü' -> "ue"
|
||||
* 'ß' -> "ss"
|
||||
* '�' -> "ae"
|
||||
* '�' -> "oe"
|
||||
* '�' -> "ue"
|
||||
* '�' -> "ss"
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
* This is a simple latin1 mapping table, which maps all accented
|
||||
* characters to their non-accented equivalents. Note: in this
|
||||
* table, 'ä' is mapped to 'A', 'ÿ' is mapped to 'Y', etc. - all
|
||||
* table, '�' is mapped to 'A', '�' is mapped to 'Y', etc. - all
|
||||
* accented characters except the following are treated the same way.
|
||||
* Ü, ü, Ö, ö, Ä, ä
|
||||
* �, �, �, �, �, �
|
||||
*/
|
||||
|
||||
static uchar sort_order_latin1_de[] = {
|
||||
@@ -534,7 +534,7 @@ uchar combo2map[]={
|
||||
my_strnxfrm_latin_de() on both strings and compared the result strings.
|
||||
|
||||
This means that:
|
||||
Ä must also matches ÁE and Aè, because my_strxn_frm_latin_de() will convert
|
||||
� must also matches �E and A�, because my_strxn_frm_latin_de() will convert
|
||||
both to AE.
|
||||
|
||||
The other option would be to not do any accent removal in
|
||||
@@ -681,7 +681,7 @@ void my_hash_sort_latin1_de(CHARSET_INFO *cs __attribute__((unused)),
|
||||
const uchar *end;
|
||||
/*
|
||||
Remove end space. We have to do this to be able to compare
|
||||
'AE' and 'Ä' as identical
|
||||
'AE' and '�' as identical
|
||||
*/
|
||||
end= skip_trailing_space(key, len);
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
integer that determines the number of significant digits in a
|
||||
particular radix R, where R is either 2 or 10. S is a non-negative
|
||||
integer. Every value of an exact numeric type of scale S is of the
|
||||
form n*10^{-S}, where n is an integer such that -R^P <= n <= R^P.
|
||||
form n*10^{-S}, where n is an integer such that �-R^P <= n <= R^P.
|
||||
|
||||
[...]
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ set(Detour_STAT_SRCS
|
||||
|
||||
if(WIN32)
|
||||
include_directories(
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ set(Recast_STAT_SRCS
|
||||
|
||||
if(WIN32)
|
||||
include_directories(
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -32,20 +32,20 @@ set(collision_STAT_SRCS
|
||||
|
||||
include_directories(
|
||||
${CMAKE_BINARY_DIR}
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/g3dlite/include
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Detour
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/Configuration
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/Debugging
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/Database
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/Debugging
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/Dynamic
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/Dynamic/LinkedReference
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/Logging
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/Threading
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/Packets
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/Utilities
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/framework/DataStores
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Configuration
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic/LinkedReference
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Logging
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/DataStores
|
||||
${CMAKE_SOURCE_DIR}/src/game/Addons
|
||||
${CMAKE_SOURCE_DIR}/src/game/Conditions
|
||||
${CMAKE_SOURCE_DIR}/src/game/Entities/Item
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
# check what platform we're on (64-bit or 32-bit), and create a simpler test than CMAKE_SIZEOF_VOID_P
|
||||
if(CMAKE_SIZEOF_VOID_P MATCHES 8)
|
||||
set(PLATFORM 64)
|
||||
MESSAGE(STATUS "Detected 64-bit platform")
|
||||
else()
|
||||
set(PLATFORM 32)
|
||||
MESSAGE(STATUS "Detected 32-bit platform")
|
||||
endif()
|
||||
|
||||
include("${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/settings.cmake")
|
||||
|
||||
if(WIN32)
|
||||
include("${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/win/settings.cmake")
|
||||
elseif(UNIX)
|
||||
include("${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/unix/settings.cmake")
|
||||
endif()
|
||||
|
||||
include("${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/after_platform.cmake")
|
||||
+4
-4
@@ -56,10 +56,10 @@ set(shared_STAT_SRCS
|
||||
|
||||
include_directories(
|
||||
${CMAKE_BINARY_DIR}
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Detour
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/SFMT
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/sockets/include
|
||||
${CMAKE_SOURCE_DIR}/modules/acore/deps/utf8cpp
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/SFMT
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/sockets/include
|
||||
${CMAKE_SOURCE_DIR}/modules/worldengine/deps/utf8cpp
|
||||
${CMAKE_SOURCE_DIR}/src
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/Configuration
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user