Moved build to a subdir underneath the eduke32 dir to avoid people trying to compile from the build src dir by mistake

git-svn-id: https://svn.eduke32.com/eduke32@1105 1a8010ca-5511-0410-912e-c29ae57300e0

polymer/eduke32/Makefile

@@ -32,7 +32,7 @@ OPTLEVEL?=2
 # Build locations
 SRC=source
 RSRC=rsrc
-EROOT=../build
+EROOT=build
 ESRC=$(EROOT)/src
 EINC=$(EROOT)/include
 INC=$(SRC)
@@ -88,7 +88,8 @@ JMACTOBJ=$(OBJ)/util_lib.$o \
 	$(OBJ)/keyboard.$o \
 	$(OBJ)/mouse.$o \
 	$(OBJ)/mathutil.$o \
-	$(OBJ)/scriplib.$o
+	$(OBJ)/scriplib.$o \
+	$(OBJ)/animlib.$o
 
 AUDIOLIB_FX_STUB=$(OBJ)/audiolib_fxstub.$o
 AUDIOLIB_MUSIC_STUB=$(OBJ)/audiolib_musicstub.$o
@@ -129,7 +130,6 @@ endif
 GAMEOBJS=$(OBJ)/game.$o \
 	$(OBJ)/actors.$o \
 	$(OBJ)/anim.$o \
-	$(OBJ)/animlib.$o \
 	$(OBJ)/config.$o \
 	$(OBJ)/gamedef.$o \
 	$(OBJ)/gameexec.$o \

polymer/eduke32/Makefile.msvc

@@ -2,7 +2,7 @@
 
 SRC=source
 OBJ=obj_win
-EROOT=..\build
+EROOT=build
 EINC=$(EROOT)\include
 EOBJ=eobj_win
 INC=$(SRC)

polymer/eduke32/build/Makefile.shared

@@ -178,21 +178,21 @@ ifneq (0,$(POLYMER))
 endif
 
 ifeq ($(PRETTY_OUTPUT),1)
-BUILD_STARTED = printf "\033[K\033[1;36mBuild started using $(CC) $(OURCFLAGS)\033[0m\n"
+BUILD_STARTED = printf "\033[K\033[1;36mBuild started using \"$(CC) $(OURCFLAGS)\"\033[0m\n"
 BUILD_FINISHED = printf "\033[K\033[1;36mBuild successful:\033[0m\n"
-COMPILE_STATUS = printf "\033[K\033[0;37mCompiling \033[1;37m$<\033[0;37m...\033[0m\r"
+COMPILE_STATUS = printf "\033[K\033[0;37mBuilding object \033[1;37m$@\033[0;37m...\033[0m\r"
-COMPILE_OK = printf "\033[K\033[0;32mCompiled \033[1;32m$<\033[0;32m.\033[0m\n"
+COMPILE_OK = printf "\033[K\033[0;32mBuilt object \033[1;32m$@\033[0;32m.\033[0m\n"
-COMPILE_FAILED = printf "\033[K\033[0;31mFailed compiling \033[1;31m$<\033[0;31m!\033[0m\n"; exit 1
+COMPILE_FAILED = printf "\033[K\033[0;31mFailed building \033[1;31m$@\033[0;31m from\033[0m \033[1;31m$<\033[0;31m!\033[0m\n"; exit 1
-LINK_STATUS = printf "\033[K\033[0;37mLinking \033[1;37m$@\033[0;37m...\033[0m\r"
+LINK_STATUS = printf "\033[K\033[0;37mLinking executable \033[1;37m$@\033[0;37m...\033[0m\r"
-LINK_OK = printf "\033[K\033[0;32mLinked \033[1;32m$@\033[0;32m.\033[0m\n"
+LINK_OK = printf "\033[K\033[0;32mLinked executable \033[1;32m$@\033[0;32m.\033[0m\n"
-LINK_FAILED = printf "\033[K\033[0;31mFailed linking \033[1;31m$@\033[0;31m!\033[0m\n"; exit 1
+LINK_FAILED = printf "\033[K\033[0;31mFailed linking executable \033[1;31m$@\033[0;31m!\033[0m\n"; exit 1
 else
 BUILD_STARTED = 
 BUILD_FINISHED = 
 COMPILE_STATUS = 
-COMPILE_OK = echo
+COMPILE_OK = true
-COMPILE_FAILED = echo; exit 1
+COMPILE_FAILED = false; exit 1
 LINK_STATUS = 
-LINK_OK = echo
+LINK_OK = true
-LINK_FAILED = echo; exit 1
+LINK_FAILED = false; exit 1
 endif