Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/GrangerHub/tremulous
Browse files Browse the repository at this point in the history
  • Loading branch information
Chomenor committed Mar 30, 2020
2 parents eeeb57f + 38cbdc8 commit 89ea9ea
Show file tree
Hide file tree
Showing 38 changed files with 3,071 additions and 441 deletions.
8 changes: 6 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -450,9 +450,13 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu")
endif

ifeq ($(USE_CURL),1)
CLIENT_CFLAGS += $(CURL_CFLAGS)
ifneq ($(USE_CURL_DLOPEN),1)
CLIENT_LIBS += $(CURL_LIBS)
ifeq ($(USE_LOCAL_HEADERS),1)
CLIENT_CFLAGS += -I$(CURLHDIR)
else
CLIENT_CFLAGS += $(CURL_CFLAGS)
endif
endif
endif

Expand Down Expand Up @@ -640,7 +644,7 @@ ifdef MINGW

# In the absence of wspiapi.h, require Windows XP or later
ifeq ($(shell test -e $(CMDIR)/wspiapi.h; echo $$?),1)
# FIXIT-L Update WINVER=_WIN32_WINNT_WIN7 (see https://msdn.microsoft.com/en-us/library/6sehtctf.aspx)
# FIXIT-L Update WINVER=_WIN32_WINNT_WIN7 (see https://msdn.microsoft.com/en-us/library/6sehtctf.aspx)
BASE_CFLAGS += -DWINVER=0x501
endif

Expand Down
2 changes: 1 addition & 1 deletion assets/ui/ingame_options.menu
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
style WINDOW_STYLE_EMPTY
text "Name:"
cvar "name"
maxchars 40
maxchars 256
rect CONTENT_X (CONTENT_Y+(0*ELEM_H)) CONTENT_W ELEM_H
textalign ALIGN_RIGHT
textvalign VALIGN_CENTER
Expand Down
2 changes: 1 addition & 1 deletion assets/ui/options.menu
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
style WINDOW_STYLE_EMPTY
text "Name:"
cvar "name"
maxchars 26
maxchars 256
rect X Y W ELEM_H
textalign ALIGN_RIGHT
textalignx TOFF_X
Expand Down
Loading

0 comments on commit 89ea9ea

Please sign in to comment.