diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-14 13:57:39 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-14 13:57:39 +0000 |
commit | 44097deb98135de24faf8d0f2adb985d1c5cd07a (patch) | |
tree | 606df029308197fd59225c5b04e8aba52512e1af | |
parent | 9faef3ac1dbd6669b9679f67b6de5a16b34dae12 (diff) | |
download | crawl-ref-44097deb98135de24faf8d0f2adb985d1c5cd07a.tar.gz crawl-ref-44097deb98135de24faf8d0f2adb985d1c5cd07a.zip |
Refixed DOS and Windows makefiles.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1307 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r-- | crawl-ref/source/makefile.dos | 6 | ||||
-rw-r--r-- | crawl-ref/source/makefile.mgw | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/makefile.dos b/crawl-ref/source/makefile.dos index fb9947e7db..83f2dc6b2c 100644 --- a/crawl-ref/source/makefile.dos +++ b/crawl-ref/source/makefile.dos @@ -19,7 +19,7 @@ LEX := flex YACC := bison -y ifeq ($(LUASRC),) -LUASRC := util\lua\src\\ +LUASRC := util\lua\src endif LUALIB = lua @@ -57,7 +57,7 @@ endif OBJECTS := $(UTIL)levcomp.o $(UTIL)levtab.o $(UTIL)levlex.o $(OBJECTS) -GAME_DEPENDS := $(LUASRC)$(LUALIBA) $(OBJECTS) +GAME_DEPENDS := $(LUASRC)\$(LUALIBA) $(OBJECTS) ########################################################################## @@ -162,7 +162,7 @@ profile: $(GAME_DEPENDS) ############################################################################# # Build Lua -$(LUASRC)$(LUALIBA): +$(LUASRC)\$(LUALIBA): @echo Building Lua... @cd $(LUASRC) @$(MAKE) crawl_dos diff --git a/crawl-ref/source/makefile.mgw b/crawl-ref/source/makefile.mgw index 3e590089e8..d4e6e6c829 100644 --- a/crawl-ref/source/makefile.mgw +++ b/crawl-ref/source/makefile.mgw @@ -25,7 +25,7 @@ LEX := flex YACC := bison -y ifeq ($(LUASRC),) -LUASRC := util\lua\src\\ +LUASRC := util\lua\src endif LUALIB = lua @@ -74,7 +74,7 @@ OBJECTS := levcomp.tab.o levcomp.lex.o levcomp.o \ OBJECTS := $(foreach file,$(OBJECTS),$(OPATH)/$(file)) -GAME_DEPENDS := prepare $(LUASRC)$(LUALIBA) $(OBJECTS) +GAME_DEPENDS := prepare $(LUASRC)\$(LUALIBA) $(OBJECTS) ########################################################################## @@ -175,6 +175,6 @@ $(OPATH)/%.o: $(UTIL)%.cc ############################################################################# # Build Lua -$(LUASRC)$(LUALIBA): +$(LUASRC)\$(LUALIBA): @echo Building Lua... @cd $(LUASRC) && $(MAKE) crawl_mingw |