Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 08:55:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge git://github.com/TrinityCore/TrinityCore into 4.3.4

Browse Source
This commit is contained in:
kaelima
2012-11-10 04:39:46 +01:00
parent 44729aa69f 2d0dddfcbe
commit 08f6d3e975
3 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dep/acelite/6.1.4_tc_changes.diff
View File

@@ -3,7 +3,7 @@ new file mode 100644
index 0000000..acd3d5a
--- /dev/null
+++ b/dep/acelite/ace/CMakeLists.txt
@@ -0,0 +1,337 @@
@@ -0,0 +1,348 @@
+# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+#
+# This file is free software; as a special exception the author gives
@@ -325,6 +325,11 @@ index 0000000..acd3d5a
+ XTI_ATM_Mcast.cpp
+)
+
+if (USE_COREPCH)
+ set(ace_PCH_HDR PrecompiledHeaders/WinAcePCH.h)
+ set(ace_PCH_SRC PrecompiledHeaders/WinAcePCH.cpp)
+endif()
+
+include_directories(
+ ${CMAKE_SOURCE_DIR}/dep/acelite
+ ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders
@@ -336,9 +341,15 @@ index 0000000..acd3d5a
+
+add_definitions(-DACE_BUILD_DLL)
+
+add_library(ace SHARED ${ace_STAT_SRCS})
+add_library(ace SHARED
+ ${ace_STAT_SRCS}
+ ${ace_PCH_SRC}
+)
+
+add_native_precompiled_header(ace ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders/WinAcePCH)
+# Generate precompiled header
+if( USE_COREPCH )
+ add_cxx_pch(ace ${ace_PCH_HDR} ${ace_PCH_SRC})
+endif()
+
+install(TARGETS ace RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}")
diff --git a/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp b/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp

15
dep/acelite/ace/CMakeLists.txt
View File

@@ -320,6 +320,11 @@ set(ace_STAT_SRCS
XTI_ATM_Mcast.cpp
)
if (USE_COREPCH)
set(ace_PCH_HDR PrecompiledHeaders/WinAcePCH.h)
set(ace_PCH_SRC PrecompiledHeaders/WinAcePCH.cpp)
endif()
include_directories(
${CMAKE_SOURCE_DIR}/dep/acelite
${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders
@@ -331,8 +336,14 @@ set_source_files_properties(Atomic_Op_Sparc.c Rtems_init.c PROPERTIES LANGUAGE C
add_definitions(-DACE_BUILD_DLL)
add_library(ace SHARED ${ace_STAT_SRCS})
add_library(ace SHARED
${ace_STAT_SRCS}
${ace_PCH_SRC}
)
add_native_precompiled_header(ace ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders/WinAcePCH)
# Generate precompiled header
if( USE_COREPCH )
add_cxx_pch(ace ${ace_PCH_HDR} ${ace_PCH_SRC})
endif()
install(TARGETS ace RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}")

13
dep/g3dlite/G3D-v8.0_extra.diff
View File

@@ -10,3 +10,16 @@ index 3469b81..9fe098d 100644
#endif
diff --git a/dep/g3dlite/include/G3D/platform.h b/dep/g3dlite/include/G3D/platform.h
index c8d2f0b..11093f4 100644
--- a/dep/g3dlite/include/G3D/platform.h
+++ b/dep/g3dlite/include/G3D/platform.h
@@ -57,7 +57,7 @@
#elif defined(__linux__)
#define G3D_LINUX
#elif defined(__APPLE__)
- #define G3D_OSX
+ #define G3D_LINUX
// Prevent OS X fp.h header from being included; it defines
// pi as a constant, which creates a conflict with G3D