diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-12 01:51:42 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-12 01:51:42 +0000 |
| commit | 440574bfab8d9a81514b0a1b8b7da2465a7d10c5 (patch) | |
| tree | b34982128b9aa228f019654b147121037232c90f | |
| parent | 8bcb968c73563276b4a225fc94baf3cb32f394c2 (diff) | |
| download | crawl-ref-440574bfab8d9a81514b0a1b8b7da2465a7d10c5.tar.gz crawl-ref-440574bfab8d9a81514b0a1b8b7da2465a7d10c5.zip | |
Applying r6509 to 0.4.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6510 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/libutil.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/makefile.mgw | 2 | ||||
| -rw-r--r-- | crawl-ref/source/makefile_tiles.mgw | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/libutil.cc b/crawl-ref/source/libutil.cc index e9b9c1193f..17a87b7780 100644 --- a/crawl-ref/source/libutil.cc +++ b/crawl-ref/source/libutil.cc @@ -37,7 +37,7 @@ #ifdef REGEX_PCRE // Statically link pcre on Windows - #ifdef WIN32CONSOLE + #if defined(WIN32CONSOLE) || defined(WIN32TILES) #define PCRE_STATIC #endif diff --git a/crawl-ref/source/makefile.mgw b/crawl-ref/source/makefile.mgw index f60dd5ffc8..9c306ae911 100644 --- a/crawl-ref/source/makefile.mgw +++ b/crawl-ref/source/makefile.mgw @@ -132,12 +132,14 @@ endif mkdir $(INSTALLDIR)\dat\descript 2>null || echo "">nul mkdir $(INSTALLDIR)\dat\database 2>null || echo "">nul mkdir $(INSTALLDIR)\settings 2>null || echo "">nul + mkdir $(INSTALLDIR)\docs 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 ..\settings\* $(INSTALLDIR)\settings + copy /y ..\docs\* $(INSTALLDIR)\docs clean: $(DELETE) $(OPATH)\*.o diff --git a/crawl-ref/source/makefile_tiles.mgw b/crawl-ref/source/makefile_tiles.mgw index dae38c86f2..9a3abf1e5c 100644 --- a/crawl-ref/source/makefile_tiles.mgw +++ b/crawl-ref/source/makefile_tiles.mgw @@ -174,13 +174,14 @@ endif mkdir $(INSTALLDIR)\dat\descript 2>null || echo "">nul mkdir $(INSTALLDIR)\dat\database 2>null || echo "">nul mkdir $(INSTALLDIR)\settings 2>null || echo "">nul + mkdir $(INSTALLDIR)\docs 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 ..\settings\* $(INSTALLDIR)\settings - copy /y ..\*.txt $(INSTALLDIR) + copy /y ..\docs\* $(INSTALLDIR)\docs mkdir $(INSTALLDIR)\dat\tiles 2>nul || echo "" > nul copy /y dat\tiles\*.bmp $(INSTALLDIR)\dat\tiles |