diff options
| author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2008-11-15 18:26:32 +0000 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2008-12-03 23:39:30 +0100 |
| commit | 97fdac1608a0b4b07aae26b144c6ee7991e6c5eb (patch) | |
| tree | e140bc09861b1d7a08a7fd7a3ef89e89b56b939e | |
| parent | ui-repolist: handle empty agefiles (diff) | |
| download | cgit-pink-97fdac1608a0b4b07aae26b144c6ee7991e6c5eb.tar.gz cgit-pink-97fdac1608a0b4b07aae26b144c6ee7991e6c5eb.zip | |
Extra cygwin-specific changes
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| -rw-r--r-- | Makefile | 23 | ||||
| -rw-r--r-- | cgit.h | 6 |
2 files changed, 23 insertions, 6 deletions
diff --git a/Makefile b/Makefile index 2107610..dc98072 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,26 @@ GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 # -include cgit.conf +# Define NO_STRCASESTR if you don't have strcasestr. +# +# Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). +# + +#-include config.mak + +# +# Platform specific tweaks +# + +uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') +uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') +uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') + +ifeq ($(uname_O),Cygwin) + NO_STRCASESTR = YesPlease + NEEDS_LIBICONV = YesPlease +endif + # # Define a way to invoke make in subdirs quietly, shamelessly ripped # from git.git @@ -96,6 +116,9 @@ CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' ifdef NO_ICONV CFLAGS += -DNO_ICONV endif +ifdef NO_STRCASESTR + CFLAGS += -DNO_STRCASESTR +endif cgit: $(OBJECTS) libgit $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) diff --git a/cgit.h b/cgit.h index 91db98a..92f0c5a 100644 --- a/cgit.h +++ b/cgit.h @@ -233,11 +233,5 @@ extern const char *cgit_repobasename(const char *reponame); extern int cgit_parse_snapshots_mask(const char *str); -/* libgit.a either links against or compiles its own implementation of - * strcasestr(), and we'd like to reuse it. Simply re-declaring it - * seems to do the trick. - */ -extern char *strcasestr(const char *haystack, const char *needle); - #endif /* CGIT_H */ |