TheCloneArmy/mcrcon
1
0
Fork 0
mirror of https://github.com/Tiiffi/mcrcon.git synced 2025-10-27 11:21:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/macos-touchup' into travis-maybe

Browse Source
This commit is contained in:
Dan Buch
2016-12-27 11:37:15 -05:00
parent 56389a8bec 0198ca77a7
commit afbed173aa
3 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
INSTALL → INSTALL.md
View File

42
Makefile
View File

@ -3,35 +3,47 @@
# export CROSS_COMPILE=arm-none-linux-gnueabi- # export CROSS_COMPILE=arm-none-linux-gnueabi-
# make # make
EXENAME = mcrcon
PREFIX ?= /usr/local
CFLAGS = -std=gnu99 -Wall -Wextra -Wpedantic -Os -s
EXTRAFLAGS = -fstack-protector-strong
CC = gcc
INSTALL = install
LINKER =
RM = rm -f
ifeq ($(OS), Windows_NT) ifeq ($(OS), Windows_NT)
LINKER = -lws2_32 LINKER = -lws2_32
EXENAME = mcrcon.exe EXENAME = mcrcon.exe
RM = cmd /C del /F RM = cmd /C del /F
else
LINKER =
EXENAME = mcrcon
RM = rm -f
endif endif
CC = gcc ifeq ($(shell uname), Darwin)
CFLAGS = -std=gnu99 -Wall -Wextra -Wpedantic -Os -s INSTALL = ginstall
EXTRAFLAGS = -fstack-protector-strong CFLAGS = -std=gnu99 -Wall -Wextra -Wpedantic -Os
endif
all: .PHONY: all
$(CROSS_COMPILE)$(CC) $(CFLAGS) $(EXTRAFLAGS) -o $(EXENAME) mcrcon.c $(LINKER) all: $(EXENAME)
$(EXENAME): mcrcon.c
$(CROSS_COMPILE)$(CC) $(CFLAGS) $(EXTRAFLAGS) -o $@ $< $(LINKER)
ifneq ($(OS), Windows_NT) ifneq ($(OS), Windows_NT)
.PHONY: install
install: install:
cp $(EXENAME) /usr/local/bin/$(EXENAME) $(INSTALL) -vD $(EXENAME) $(PREFIX)/bin/$(EXENAME)
chmod 0755 /usr/local/bin/$(EXENAME) $(INSTALL) -vD -m 0644 mcrcon.1 $(PREFIX)/share/man/man1/mcrcon.1
cp mcrcon.1 /usr/local/share/man/man1/mcrcon.1
chmod 0644 /usr/local/share/man/man1/mcrcon.1
@echo "\nmcrcon installed. Run 'make uninstall' if you want to uninstall.\n" @echo "\nmcrcon installed. Run 'make uninstall' if you want to uninstall.\n"
.PHONY: uninstall
uninstall: uninstall:
rm -f /usr/local/bin/$(EXENAME) rm -f $(PREFIX)/bin/$(EXENAME) $(PREFIX)/share/man/man1/mcrcon.1
rm -f /usr/local/share/man/man1/mcrcon.1
@echo "\nmcrcon uninstalled.\n" @echo "\nmcrcon uninstalled.\n"
endif endif
.PHONY: clean
clean: clean:
$(RM) $(EXENAME) $(RM) $(EXENAME)

2
mcrcon.c
View File

@ -304,7 +304,7 @@ int net_connect(const char *host, const char *port)
{ {
int sd; int sd;
struct addrinfo hints = {0}; struct addrinfo hints = {.ai_family = 0};
struct addrinfo *server_info, *p; struct addrinfo *server_info, *p;
hints.ai_family = AF_UNSPEC; hints.ai_family = AF_UNSPEC;