5 files changed, 114 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92ece2f40e5..8b64bc192ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT(Trinity)
-cmake_minimum_required(VERSION 2.4)
+cmake_minimum_required(VERSION 2.6)
 cmake_policy(SET CMP0005 OLD)
 
 include(cmake/FindAce.cmake)
@@ -121,9 +121,10 @@ FIND_ACE(ACE)
 if(ACE_FOUND)
 message(STATUS "Found ACE library: ${ACE_LIBRARY}")
 message(STATUS "Include dir is: ${ACE_INCLUDE_DIR}")
-#else(ACE_FOUND)
-#message( "** ACE library not found, will try to build it myself.")
-#SET(BUILD_ACE 1)    BRIAN LIKES MEN
+else(ACE_FOUND)
+message(SEND_ERROR "** ACE library not found! Trinity Core will not build!")
+return()
+#SET(BUILD_ACE 1)
 #SET(ACE_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/dep/ACE_wrappers ${CMAKE_BINARY_DIR}/dep/ACE_wrappers")
 #SET(ACE_LIBRARY ACE)
 #message(STATUS "I will try to build ACE from: ${ACE_INCLUDE_DIR}")
diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt
index 53490e0a15e..ef9a6927e30 100644
--- a/sql/updates/CMakeLists.txt
+++ b/sql/updates/CMakeLists.txt
@@ -1,4 +1,4 @@
-install(FILES
+INSTALL(FILES
 11_characters.sql
 45_characters.sql
 54_world.sql
@@ -33,8 +33,109 @@ install(FILES
 175_world_scripts.sql
 176_world.sql
 182_world.sql
-194_world_blacktemple.sql
-195_world_serpent_shrine.sql
-
-#Yes, i sorted them manually, so please be as kind as to add incoming .sql updates in order.
-DESTINATION share/trinity/sql/updates)
-\ No newline at end of file
+212_world_scripts.sql
+220_characters.sql
+230_world_blacktemple.sql
+230_world_scripts.sql
+230_world_serpent_shrine.sql
+230_world.sql
+231_world_scripts.sql
+233_world.sql
+238_world.sql
+240_world.sql
+241_world.sql
+247_world.sql
+262_characters.sql
+262_realmd.sql
+262_world.sql
+273_world_scripts.sql
+285_world.sql
+287_world_scripts.sql
+329_world.sql
+332_world.sql
+333_world.sql
+334_world.sql
+341_world.sql
+356_world.sql
+373_world_scripts.sql
+377_world_scripts.sql
+389_world.sql
+400_world.sql
+410_characters.sql
+426_world_scripts.sql
+427_world_scripts.sql
+444_world.sql
+452_world.sql
+455_world.sql
+471_world.sql
+480_world_scripts.sql
+488_world_scripts.sql
+502_world_scripts.sql
+505_world.sql
+506_world.sql
+513_world_scripts.sql
+519_world.sql
+537_world.sql
+541_characters.sql
+541_world.sql
+542_characters.sql
+551_world.sql
+566_world.sql
+571_world.sql
+572_world.sql
+575_world_scripts.sql
+583_world_scripts.sql
+586_world_scripts.sql
+588_world.sql
+608_world.sql
+615_world.sql
+636_world_scripts.sql
+640_world.sql
+645_world_scripts.sql
+667_world_scripts.sql
+676_world.sql
+679_world_scripts.sql
+683_world_scripts.sql
+686_world_scripts.sql
+691_world_scripts.sql
+692_world.sql
+708_world_scripts.sql
+722_world_script_texts.sql
+724_world.sql
+725_characters.sql
+725_world.sql
+728_world_scripts.sql
+733_characters.sql
+739_characters.sql
+741_characters.sql
+741_world.sql
+747_world.sql
+748_world_scripts.sql
+758_world_scripts.sql
+762_world.sql
+764_world_scripts.sql
+765_world_scripts.sql
+773_world_scripts.sql
+780_characters.sql
+783_world.sql
+785_world.sql
+789_world.sql
+807_world_scripts.sql
+817_world_scripts.sql
+822_world_scripts.sql
+826_world_scripts.sql
+832_characters.sql
+833_world_scripts.sql
+834_world_scripts.sql
+837_world_scripts.sql
+838_world_scripts.sql
+839_world_scripts.sql
+840_world_scripts.sql
+841_world_scripts.sql
+842_world.sql
+850_world_scripts.sql
+852_world_scripts.sql
+857_world_scripts.sql
+863_world_scripts.sql
+871_world.sql
+DESTINATION share/trinity/sql/updates)
diff --git a/src/shared/Database/CMakeLists.txt b/src/shared/Database/CMakeLists.txt
index a819a66dec7..78cc48436e7 100644
--- a/src/shared/Database/CMakeLists.txt
+++ b/src/shared/Database/CMakeLists.txt
@@ -13,7 +13,6 @@ SET(trinitydatabase_STAT_SRCS
    DatabasePostgre.h
    DatabaseSqlite.cpp
    DatabaseSqlite.h
-#Brian likes men
    Field.cpp
    Field.h
    MySQLDelayThread.h
diff --git a/win/VC71/genrevision.vcproj b/win/VC71/genrevision.vcproj
index 2b36151003e..fa840d44318 100644
--- a/win/VC71/genrevision.vcproj
+++ b/win/VC71/genrevision.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
     ProjectType="Visual C++"
-    Version="9,00"
+    Version="7,10"
     Name="genrevision"
     ProjectGUID="{803F488E-4C5A-4866-8D5C-1E6C03C007C2}"
     RootNamespace="genrevision"
diff --git a/win/VC80/genrevision.vcproj b/win/VC80/genrevision.vcproj
index 2b36151003e..4725000e016 100644
--- a/win/VC80/genrevision.vcproj
+++ b/win/VC80/genrevision.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
     ProjectType="Visual C++"
-    Version="9,00"
+    Version="8,00"
     Name="genrevision"
     ProjectGUID="{803F488E-4C5A-4866-8D5C-1E6C03C007C2}"
     RootNamespace="genrevision"