X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=makefile;h=1469f7e7bd12f90cce58d9d5377c5454c0cf2e16;hp=920a9e84b9c0a51f18f53b27be632ed011e92751;hb=5e7af308c146e5f65a87f61d0bead8017047720b;hpb=7df12163f2fe3193d5709ae8172eeaa5e92933b5 diff --git a/makefile b/makefile index 920a9e84..1469f7e7 100644 --- a/makefile +++ b/makefile @@ -32,12 +32,18 @@ ifneq ($(DP_MAKE_TARGET), mingw) DP_MACHINE:=$(shell uname -m) endif +# Makefile name +MAKEFILE=makefile -# Command used to delete files +# Commands ifdef windir CMD_RM=del + CMD_CP=copy /y + CMD_MKDIR=mkdir else CMD_RM=$(CMD_UNIXRM) + CMD_CP=$(CMD_UNIXCP) + CMD_MKDIR=$(CMD_UNIXMKDIR) endif # 64bits AMD CPUs use another lib directory @@ -355,7 +361,7 @@ endif ##### GNU Make specific definitions ##### -DO_LD=$(CC) -o $@ $^ $(LDFLAGS) +DO_LD=$(CC) -o ../../../$@ $^ $(LDFLAGS) ##### Definitions shared by all makefiles #####