mirror of
https://git.zx2c4.com/cgit
synced 2024-11-22 08:28:42 +00:00
Extra cygwin-specific changes
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
parent
c7d1402b17
commit
97fdac1608
23
Makefile
23
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)
|
||||
|
6
cgit.h
6
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 */
|
||||
|
Loading…
Reference in New Issue
Block a user