From 4ae478257362a391d5f8001baf3b80552189c36f Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Tue, 21 Oct 2008 22:19:26 +0000
Subject: [PATCH] added wizard.cpp

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3178 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/codeblocks/AssaultCube.cbp | 4 ++--
 source/src/Makefile               | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/source/codeblocks/AssaultCube.cbp b/source/codeblocks/AssaultCube.cbp
index 56c47b66..334d30ae 100644
--- a/source/codeblocks/AssaultCube.cbp
+++ b/source/codeblocks/AssaultCube.cbp
@@ -178,14 +178,14 @@
 		<Unit filename="../src/water.cpp" />
 		<Unit filename="../src/weapon.cpp" />
 		<Unit filename="../src/weapon.h" />
+        <Unit filename="../src/winserviceinstaller.h" />
+        <Unit filename="../src/wizard.cpp" />
 		<Unit filename="../src/world.cpp" />
 		<Unit filename="../src/world.h" />
 		<Unit filename="../src/worldio.cpp" />
 		<Unit filename="../src/worldlight.cpp" />
 		<Unit filename="../src/worldocull.cpp" />
 		<Unit filename="../src/worldrender.cpp" />
-		<Unit filename="../wizard/src/winserviceinstaller.h" />
-		<Unit filename="../wizard/src/wizard.cpp" />
 		<Unit filename="../xcode/ConsoleView.h" />
 		<Unit filename="../xcode/Launcher.h" />
 		<Unit filename="../xcode/SDLMain.h" />
diff --git a/source/src/Makefile b/source/src/Makefile
index 8a9ccdb9..115956c5 100644
--- a/source/src/Makefile
+++ b/source/src/Makefile
@@ -35,6 +35,7 @@ CLIENT_OBJS= \
 	tools.o \
 	water.o \
 	weapon.o \
+	wizard.o \
 	world.o \
 	worldio.o \
 	worldlight.o \
@@ -55,7 +56,8 @@ SERVER_FILES= \
 	serverms.cpp \
 	server.cpp \
 	protocol.cpp \
-	tools.cpp
+	tools.cpp \
+	wizard.cpp
 
 default: all