diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-26 16:36:43 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-26 16:36:43 +0000 |
| commit | a20addc5d92d362f113a446e989c6a34cccd3c6c (patch) | |
| tree | ba0466427ba6acf82326db57ea37840cf2929b3b /crawl-ref/source/makefile.mgw | |
| parent | a1daeea25c5d2187028661b6cd835ed3fee771e7 (diff) | |
| download | crawl-ref-a20addc5d92d362f113a446e989c6a34cccd3c6c.tar.gz crawl-ref-a20addc5d92d362f113a446e989c6a34cccd3c6c.zip | |
Moved all option files to settings directory.
Crawl loads init.txt from data file path if it can't find any other .crawlrc.
makefile changes to copy settings directory to install dir. Tested only on Linux/tty.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5258 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/makefile.mgw')
| -rw-r--r-- | crawl-ref/source/makefile.mgw | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/crawl-ref/source/makefile.mgw b/crawl-ref/source/makefile.mgw index cf802826e0..fa55dbc113 100644 --- a/crawl-ref/source/makefile.mgw +++ b/crawl-ref/source/makefile.mgw @@ -53,7 +53,7 @@ YCFLAGS := $(INCLUDES) $(CFOTHERS) OBJECTS := $(OBJECTS) libw32c.o -LDFLAGS = +LDFLAGS = #LIB = -lcurso -lpano @@ -131,12 +131,14 @@ endif mkdir $(INSTALLDIR)\dat\clua 2>null || echo "">nul mkdir $(INSTALLDIR)\dat\descript 2>null || echo "">nul mkdir $(INSTALLDIR)\dat\database 2>null || echo "">nul + mkdir $(INSTALLDIR)\settings 2>null || echo "">nul copy /y dat\*.des $(INSTALLDIR)\dat copy /y dat\lua\*.lua $(INSTALLDIR)\dat\lua copy /y dat\clua\*.lua $(INSTALLDIR)\dat\clua copy /y dat\descript\*.txt $(INSTALLDIR)\dat\descript copy /y dat\database\*.txt $(INSTALLDIR)\dat\database - copy /y ..\init.txt $(INSTALLDIR) + copy /y ..\settings\* $(INSTALLDIR)\settings + copy /y ..\init.txt $(INSTALLDIR) clean: $(DELETE) $(OPATH)\*.o @@ -155,14 +157,14 @@ clean-sql: cd $(SQLSRC) && $(MAKE) "RM_F=del /f" clean distclean: clean clean-lua clean-sql - $(DELETE) $(OPATH)\*.o + $(DELETE) $(OPATH)\*.o $(DELETE) *.o $(DELETE) bones.* $(DELETE) $(OPATH)\bones.* $(DELETE) morgue.txt $(DELETE) $(OPATH)\morgue.txt - $(DELETE) scores - $(DELETE) $(OPATH)\scores + $(DELETE) scores + $(DELETE) $(OPATH)\scores $(DELETE) crawl.exe $(DELETE) $(subst /,\,$(APPNAME)) $(DELETE) *.sav @@ -185,7 +187,7 @@ profile: $(GAME_DEPENDS) ${CXX} -g -p ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(APPNAME) $(LIB) $(OPATH)/%.o: %.cc - ${CXX} ${CFLAGS} -o $@ -c $< + ${CXX} ${CFLAGS} -o $@ -c $< $(OPATH)/%.o: $(UTIL)%.cc $(CXX) $(YCFLAGS) -o $@ -c $< |