7 files changed, 120 insertions, 10 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index fea7526b9c8..98381bbafdc 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -1,8 +1,26 @@
-#add_subdirectory(ace)
-#add_subdirectory(libmpq)
+# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+if(NOT MACOSX)
+  add_subdirectory(jemalloc)
+endif()
+
+if(NOT UNIX)
+  add_subdirectory(ace)
+  add_subdirectory(zlib)
+  add_subdirectory(bzip2)
+endif()
 
-add_subdirectory(zlib)
-add_subdirectory(bzip2)
 add_subdirectory(g3dlite)
-add_subdirectory(jemalloc)
 add_subdirectory(sockets)
+
+# temporary disable libmpq building (through CMake at least) for now
+# - needs a proper CMakeLists.txt
+#add_subdirectory(libmpq)
diff --git a/externals/ace/CMakeLists.txt b/externals/ace/CMakeLists.txt
new file mode 100644
index 00000000000..fe2a2488d9f
--- /dev/null
+++ b/externals/ace/CMakeLists.txt
@@ -0,0 +1,24 @@
+# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+file(GLOB sources *.cpp)
+
+set(ace_STAT_SRCS
+  ${sources}
+)
+
+include_directories(
+  ${CMAKE_SOURCE_DIR}/externals
+  ${CMAKE_SOURCE_DIR}/externals/zlib
+)
+
+add_definitions(-DACE_BUILD_DLL)
+
+add_library(ace STATIC ${ace_STAT_SRCS})
diff --git a/externals/bzip2/CMakeLists.txt b/externals/bzip2/CMakeLists.txt
index ef857f462ab..3de5475610a 100644
--- a/externals/bzip2/CMakeLists.txt
+++ b/externals/bzip2/CMakeLists.txt
@@ -1,9 +1,21 @@
+# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
 file(GLOB sources *.c)
+
 set(bzip2_STAT_SRCS
   ${sources}
 )
 
 include_directories(
+  ${CMAKE_SOURCE_DIR}/externals/zlib
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
diff --git a/externals/g3dlite/CMakeLists.txt b/externals/g3dlite/CMakeLists.txt
index 9f302eff960..da5c89ec143 100644
--- a/externals/g3dlite/CMakeLists.txt
+++ b/externals/g3dlite/CMakeLists.txt
@@ -1,12 +1,37 @@
+# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
 file(GLOB sources *.cpp)
 
-SET(g3dlib_STAT_SRCS
+set(g3dlib_STAT_SRCS
   ${sources}
+)
+if(WIN32)
+  include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}/externals/zlib
   )
-
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
+else()
+  include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
   )
+endif()
 
 add_library(g3dlib STATIC ${g3dlib_STAT_SRCS})
-target_link_libraries(g3dlib zlib)
+
+if(WIN32)
+  target_link_libraries(g3dlib
+    zlib
+  )
+else()
+  target_link_libraries(g3dlib
+    ${ZLIB_LIBRARIES}
+  )
+endif()
diff --git a/externals/jemalloc/CMakeLists.txt b/externals/jemalloc/CMakeLists.txt
index 1e32407b456..d560c6ba675 100644
--- a/externals/jemalloc/CMakeLists.txt
+++ b/externals/jemalloc/CMakeLists.txt
@@ -1,5 +1,15 @@
+# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 file(GLOB sources *.c)
+
 set(jemalloc_STAT_SRC
   ${sources}
 )
diff --git a/externals/sockets/CMakeLists.txt b/externals/sockets/CMakeLists.txt
index 716da975ca9..a1756773c08 100644
--- a/externals/sockets/CMakeLists.txt
+++ b/externals/sockets/CMakeLists.txt
@@ -1,4 +1,15 @@
+# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
 file(GLOB sources *.cpp)
+
 set(trinitysockets_STAT_SRCS
   ${sources}
 )
diff --git a/externals/zlib/CMakeLists.txt b/externals/zlib/CMakeLists.txt
index 1887110020c..bd194531bb5 100644
--- a/externals/zlib/CMakeLists.txt
+++ b/externals/zlib/CMakeLists.txt
@@ -1,3 +1,13 @@
+# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
 file(GLOB sources *.c)
 file(GLOB headers *.h)