Half finished attempt to make the source scripts handle spaces in path names
(for instance for $BUILD_WORK). Unfortunately, it probably won't be completely finished as long as we keep using GNU make. It's just too far gone. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1346 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
+25
-4
@@ -1,3 +1,6 @@
|
||||
# Make file for the uqm build system. Invoked from build/unix/build_functions
|
||||
# By Serge van den Boom
|
||||
|
||||
default:
|
||||
./build.sh sc2
|
||||
|
||||
@@ -6,19 +9,37 @@ default:
|
||||
if [ ! -d $$DIR ]; then \
|
||||
mkdir -p "$$DIR"; \
|
||||
fi
|
||||
$(WINDRES) --include-dir $(dir $<) -o $@ $<
|
||||
$(WINDRES) --include-dir $(dir $<) -o "$@" "$<"
|
||||
|
||||
%.o:
|
||||
@DIR=$(dir $@); \
|
||||
if [ ! -d $$DIR ]; then \
|
||||
mkdir -p "$$DIR"; \
|
||||
fi
|
||||
$(COMPILE) -o $@ -c $(CFLAGS) $<
|
||||
$(COMPILE) -o "$@" -c $(CFLAGS) "$<"
|
||||
|
||||
target-%:
|
||||
$(COMPILE) -o $* $^ $(LDFLAGS)
|
||||
$(COMPILE) -o "$*" $^ $(LDFLAGS)
|
||||
|
||||
-include $(DEPEND_FILE)
|
||||
|
||||
## The following kludge is necessary because the GNU make 'include'
|
||||
## statement does not accept spaces etc in the argument.
|
||||
#define ESCAPE_DEPEND
|
||||
#sed -e 's/["$$ #\*\?\\]/\\&/g' << EOF
|
||||
#$${DEPEND_FILE}
|
||||
#EOF
|
||||
#endef
|
||||
#export ESCAPE_DEPEND
|
||||
#.PHONY: escape_depend
|
||||
#.INTERMEDIATE: escape_depend
|
||||
#escape_depend:
|
||||
## @set > set.out
|
||||
# @sh -x -v -c "$$ESCAPE_DEPEND"
|
||||
#ifneq ($(MAKECMDGOALS),escape_depend)
|
||||
#include $(shell $(MAKE) -f Makefile.build escape_depend)
|
||||
#endif
|
||||
|
||||
include $(DEPEND_FILE)
|
||||
|
||||
# Temporary:
|
||||
$(BUILD_WORK)/obj/release/./src/res/UrQuanMasters.rc.o: \
|
||||
|
||||
Reference in New Issue
Block a user