From 465743757a4847b860d932a20c3a7570aec6bec5 Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Thu, 17 Jul 2014 23:59:33 -0700
Subject: Items/CMakeLists.txt: Replaced glob with list of files

---
 src/Items/CMakeLists.txt | 52 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 47 insertions(+), 5 deletions(-)

(limited to 'src/Items')

diff --git a/src/Items/CMakeLists.txt b/src/Items/CMakeLists.txt
index a6fe6ea70..0c15a6944 100644
--- a/src/Items/CMakeLists.txt
+++ b/src/Items/CMakeLists.txt
@@ -4,9 +4,51 @@ project (MCServer)
 
 include_directories ("${PROJECT_SOURCE_DIR}/../")
 
-file(GLOB SOURCE
-    "*.cpp"
-    "*.h"
-)
+SET (SRCS
+	ItemHandler.cpp)
 
-add_library(Items ${SOURCE})
+SET (HDRS
+	ItemArmor.h
+	ItemBed.h
+	ItemBoat.h
+	ItemBow.h
+	ItemBrewingStand.h
+	ItemBucket.h
+	ItemCake.h
+	ItemCauldron.h
+	ItemCloth.h
+	ItemComparator.h
+	ItemDoor.h
+	ItemDye.h
+	ItemEmptyMap.h
+	ItemFishingRod.h
+	ItemFlowerPot.h
+	ItemFood.h
+	ItemHandler.h
+	ItemHoe.h
+	ItemItemFrame.h
+	ItemLeaves.h
+	ItemLighter.h
+	ItemLilypad.h
+	ItemMap.h
+	ItemMilk.h
+	ItemMinecart.h
+	ItemMobHead.h
+	ItemNetherWart.h
+	ItemPainting.h
+	ItemPickaxe.h
+	ItemPotion.h
+	ItemRedstoneDust.h
+	ItemRedstoneRepeater.h
+	ItemSapling.h
+	ItemSeeds.h
+	ItemShears.h
+	ItemShovel.h
+	ItemSign.h
+	ItemSpawnEgg.h
+	ItemString.h
+	ItemSugarcane.h
+	ItemSword.h
+	ItemThrowable.h)
+
+add_library(Items ${SRCS} ${HDRS})
-- 
cgit v1.2.3


From 725d1fd1e2995b1720673c280fea1125ac338b3c Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Fri, 18 Jul 2014 13:26:43 -0700
Subject: Subdirs: Only add_library if not using MSVC

---
 src/Items/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/Items')

diff --git a/src/Items/CMakeLists.txt b/src/Items/CMakeLists.txt
index 0c15a6944..12a467672 100644
--- a/src/Items/CMakeLists.txt
+++ b/src/Items/CMakeLists.txt
@@ -51,4 +51,6 @@ SET (HDRS
 	ItemSword.h
 	ItemThrowable.h)
 
-add_library(Items ${SRCS} ${HDRS})
+if(NOT MSVC)
+	add_library(Items ${SRCS} ${HDRS})
+endif()
-- 
cgit v1.2.3