diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-12 03:15:55 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-12 03:15:55 +0000 |
| commit | 024369e5302d65b4a5b704786f074d58371d6905 (patch) | |
| tree | 8c2e874b1647a805f74f58f31b978a3b3d1b5118 | |
| parent | 99a0db4727cd562df66c8f0dc41aee2271d9d0ae (diff) | |
| download | crawl-ref-024369e5302d65b4a5b704786f074d58371d6905.tar.gz crawl-ref-024369e5302d65b4a5b704786f074d58371d6905.zip | |
More release issues. Adding more missing doc files into 'make install' for Windows. Adding PCRE to DOS builds by default. Fixing DOS build error due to DJGPP brain damage.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6511 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/AppHdr.h | 4 | ||||
| -rw-r--r-- | crawl-ref/source/luadgn.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/makefile.dos | 4 | ||||
| -rw-r--r-- | crawl-ref/source/makefile.mgw | 2 | ||||
| -rw-r--r-- | crawl-ref/source/makefile_tiles.mgw | 2 |
5 files changed, 14 insertions, 3 deletions
diff --git a/crawl-ref/source/AppHdr.h b/crawl-ref/source/AppHdr.h index 4177673947..700bfc2c0c 100644 --- a/crawl-ref/source/AppHdr.h +++ b/crawl-ref/source/AppHdr.h @@ -180,6 +180,10 @@ #include <dos.h> + // Use Perl-compatible regular expressions. libpcre must be available and + // linked in. This is optional. + #define REGEX_PCRE + #elif defined(WIN32CONSOLE) || defined(WIN32TILES) #if defined(WIN32CONSOLE) #include "libw32c.h" diff --git a/crawl-ref/source/luadgn.cc b/crawl-ref/source/luadgn.cc index 2a0d2faac9..02e25d5b13 100644 --- a/crawl-ref/source/luadgn.cc +++ b/crawl-ref/source/luadgn.cc @@ -1788,10 +1788,11 @@ static int dgn_make_pillars(lua_State *ls) return 0; } - const float PI = 3.14159265f; + // [enne] The underscore is for DJGPP's brain damage. + const float _PI = 3.14159265f; for (int n = 0; n < num; n++) { - float angle = n * 2 * PI / (float)num; + float angle = n * 2 * _PI / (float)num; int x = (int)std::floor(std::cos(angle) * big_radius * scale_x + 0.5f); int y = (int)std::floor(std::sin(angle) * big_radius + 0.5f); diff --git a/crawl-ref/source/makefile.dos b/crawl-ref/source/makefile.dos index ea64341147..a882085a37 100644 --- a/crawl-ref/source/makefile.dos +++ b/crawl-ref/source/makefile.dos @@ -18,6 +18,8 @@ DOYACC := n LEX := flex YACC := bison -y +INSTALLDIR ?= package + ifeq ($(LUASRC),) LUASRC := util\lua\src endif @@ -30,7 +32,7 @@ SQLLIB := sql3 SQLLIBA := lib$(SQLLIB).a FSQLLIBA := $(SQLSRC)\$(SQLLIBA) -LIB = -L$(LUASRC) -l$(LUALIB) -L$(SQLSRC) -l$(SQLLIB) +LIB = -L$(LUASRC) -l$(LUALIB) -L$(SQLSRC) -l$(SQLLIB) -lpcre INCLUDES := -Iutil -I. -I$(LUASRC) -I$(SQLSRC) WORKDIR := $(shell cd) diff --git a/crawl-ref/source/makefile.mgw b/crawl-ref/source/makefile.mgw index 9c306ae911..6a525c7e3a 100644 --- a/crawl-ref/source/makefile.mgw +++ b/crawl-ref/source/makefile.mgw @@ -140,6 +140,8 @@ endif copy /y dat\database\*.txt $(INSTALLDIR)\dat\database copy /y ..\settings\* $(INSTALLDIR)\settings copy /y ..\docs\* $(INSTALLDIR)\docs + copy /y ..\* $(INSTALLDIR) + $(DELETE) $(INSTALLDIR)\*.sh clean: $(DELETE) $(OPATH)\*.o diff --git a/crawl-ref/source/makefile_tiles.mgw b/crawl-ref/source/makefile_tiles.mgw index 9a3abf1e5c..fed4392b7a 100644 --- a/crawl-ref/source/makefile_tiles.mgw +++ b/crawl-ref/source/makefile_tiles.mgw @@ -184,6 +184,8 @@ endif copy /y ..\docs\* $(INSTALLDIR)\docs mkdir $(INSTALLDIR)\dat\tiles 2>nul || echo "" > nul copy /y dat\tiles\*.bmp $(INSTALLDIR)\dat\tiles + copy /y ..\* $(INSTALLDIR) + $(DELETE) $(INSTALLDIR)\*.sh clean: $(DELETE) $(OPATH)\*.o |