| Re: [AD] open watcom / 4.0.3rc1 |
[ Thread Index |
Date Index
| More lists.liballeg.org/allegro-developers Archives
]
> I'm not sure of the best way to fix that because I'm afraid that turning /
> into \ might cause problems with some versions of 'make' for DOS.
Kind of a miracle: replacing double-quote by simple-quote seems to work both
under DOS and Windows!
Matthew, could you test the attached patch on your system? I've also included
the required bits for 'make uninstall' to work.
There is still a glitch with 'make clean' on my Win98SE system because the
Watcom compiler, being a old-style DOS executable, outputs files whose first
letter is capitalized whereas 'make' for MinGW is case-sensitive. Boring.
--
Eric Botcazou
--- /cvs/allegro/makefile.wat Fri Dec 13 16:31:44 2002
+++ allegro/makefile.wat Tue Mar 11 21:17:28 2003
@@ -71,7 +71,7 @@
CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -bt=dos4g -5s -s -d2
SFLAGS = -DDEBUGMODE=$(DEBUGMODE) -Wall
-LFLAGS = "option quiet" "option stack=128k" "system dos4g" "debug all"
+LFLAGS = 'option quiet' 'option stack=128k' 'system dos4g' 'debug all'
else
ifdef PROFILEMODE
@@ -79,14 +79,14 @@
# -------- profiling build --------
CFLAGS = $(WFLAGS) -bt=dos4g -5s -ox -et
SFLAGS = -Wall
-LFLAGS = "option quiet" "option stack=128k" "system dos4g"
+LFLAGS = 'option quiet' 'option stack=128k' 'system dos4g'
else
# -------- optimised build --------
CFLAGS = $(WFLAGS) -bt=dos4g -5s -ox
SFLAGS = -Wall
-LFLAGS = "option quiet" "option stack=128k" "system dos4g"
+LFLAGS = 'option quiet' 'option stack=128k' 'system dos4g'
endif
endif
@@ -165,7 +165,11 @@
$(WATDIR_U)/h/allegro/platform/*.h
uninstall:
- -rm -fv $(UNINSTALL_FILES)
+ define RM_FILES
+ $(foreach file, $(wildcard $(UNINSTALL_FILES)), del $(subst /,\,$(file))
+ )
+ endef
+ -$(RM_FILES)
-rd $(WATDIR_D)\h\allegro\platform
-rd $(WATDIR_D)\h\allegro\inline
-rd $(WATDIR_D)\h\allegro\internal
@@ -209,7 +213,7 @@
endif
*/%.exe: $(OBJ_DIR)/%.obj $(LIB_NAME) $(RUNNER)
- $(RUNNER) wlink \\ @ $(LFLAGS) "name $@" "file $<" "library $(LIB_NAME)"
+ $(RUNNER) wlink \\ @ $(LFLAGS) 'name $@' 'file $<' 'library $(LIB_NAME)'
obj/watcom/asmdef.inc: obj/watcom/asmdef.exe
obj/watcom/asmdef.exe obj/watcom/asmdef.inc
@@ -221,7 +225,7 @@
gcc -O -Wall -Werror -o obj/watcom/runner.exe src/misc/runner.c
define LINK_WITHOUT_LIB
- $(RUNNER) wlink \\ @ $(LFLAGS) "name $@" "$(addprefix file ,$^)"
+ $(RUNNER) wlink \\ @ $(LFLAGS) 'name $@' '$(addprefix file ,$^)'
endef
PLUGIN_LIB = lib/watcom/$(VERY_SHORT_VERSION)dat.lib
@@ -238,7 +242,7 @@
endef
define LINK_WITH_PLUGINS
-$(RUNNER) wlink \\ @ $(LFLAGS) "name $@" "file $<" $(strip "library $(PLUGIN_LIB)" $(addprefix @,$(PLUGIN_SCRIPTS)) "library $(LIB_NAME)")
+$(RUNNER) wlink \\ @ $(LFLAGS) 'name $@' 'file $<' $(strip 'library $(PLUGIN_LIB)' $(addprefix @,$(PLUGIN_SCRIPTS)) 'library $(LIB_NAME)')
endef