thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Discord Invite Fixes

Browse source 
# Conflicts:
#	src/Makefile
This commit is contained in:
JugadorXEI 2021-04-13 00:33:06 +02:00 • committed by toaster
parent f7389e74d3
commit 3f53d768d1
2 changed files with 53 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/Makefile
View file

@ -177,29 +177,80 @@ endif
include Makefile.d/detect.mk include Makefile.d/detect.mk
ifdef NOHW
OPTS+=-DNOHW
else
ifndef DC
#Hurdler: not really supported and not tested recently
#OPTS+=-DUSE_PALETTED_TEXTURE
endif
OPTS+=-DHWRENDER
OBJS+=$(OBJDIR)/hw_bsp.o $(OBJDIR)/hw_draw.o $(OBJDIR)/hw_light.o \
$(OBJDIR)/hw_main.o $(OBJDIR)/hw_clip.o $(OBJDIR)/hw_md2.o $(OBJDIR)/hw_cache.o $(OBJDIR)/hw_trick.o \
$(OBJDIR)/hw_md2load.o $(OBJDIR)/hw_md3load.o $(OBJDIR)/hw_model.o $(OBJDIR)/u_list.o
endif
# make would try to remove the implicitly made directories # make would try to remove the implicitly made directories
.PRECIOUS : %/ comptime.c .PRECIOUS : %/ comptime.c
OPTS += -DCOMPVERSION
sources:= sources:=
makedir:=../make makedir:=../make
ifndef NONX86
ifndef GCC29
ARCHOPTS?=-march=pentium
else
ARCHOPTS?=-mpentium
endif
else
ifdef X86_64
ARCHOPTS?=-march=nocona
endif
endif
# -DCOMPVERSION: flag to use comptime.h # -DCOMPVERSION: flag to use comptime.h
opts:=-DCOMPVERSION -g opts:=-DCOMPVERSION -g
libs:= libs:=
ifndef NOASM
ifndef NONX86
OBJS+=$(OBJDIR)/tmap.o $(OBJDIR)/tmap_mmx.o
OPTS+=-DUSEASM
endif
endif
nasm_format:= nasm_format:=
ifndef NOPNG
OPTS+=-DHAVE_PNG
# This is a list of variables names, of which if defined, # This is a list of variables names, of which if defined,
# also defines the name as a macro to the compiler. # also defines the name as a macro to the compiler.
passthru_opts:= passthru_opts:=
ifdef PNG_PKGCONFIG
PNG_CFLAGS?=$(shell $(PKG_CONFIG) $(PNG_PKGCONFIG) --cflags)
PNG_LDFLAGS?=$(shell $(PKG_CONFIG) $(PNG_PKGCONFIG) --libs)
else
ifdef PREFIX
PNG_CONFIG?=$(PREFIX)-libpng-config
else
PNG_CONFIG?=libpng-config
endif
# separate suffix with an underscore # separate suffix with an underscore
exesuffix:=$(call _,$(EXESUFFIX)) exesuffix:=$(call _,$(EXESUFFIX))
ifdef PNG_STATIC
PNG_CFLAGS?=$(shell $(PNG_CONFIG) --static --cflags)
PNG_LDFLAGS?=$(shell $(PNG_CONFIG) --static --ldflags)
else
PNG_CFLAGS?=$(shell $(PNG_CONFIG) --cflags)
PNG_LDFLAGS?=$(shell $(PNG_CONFIG) --ldflags)
endif
endif
include Makefile.d/platform.mk include Makefile.d/platform.mk
include Makefile.d/features.mk include Makefile.d/features.mk
include Makefile.d/versions.mk include Makefile.d/versions.mk
ifdef LINUX
PNG_CFLAGS+=-D_LARGEFILE64_SOURCE
ifdef DEBUGMODE ifdef DEBUGMODE
makedir:=$(makedir)/debug makedir:=$(makedir)/debug
endif endif

7
src/discord.c
View file

@ -362,7 +362,7 @@ static const char *DRPC_GetServerIP(void)
{ {
// We're not the server, so we could successfully get the IP! // We're not the server, so we could successfully get the IP!
// No need to do anything else :) // No need to do anything else :)
sprintf(self_ip, "%s:%u", address, current_port); strcpy(self_ip, address);
return self_ip; return self_ip;
} }
} }
@ -449,10 +449,7 @@ void DRPC_UpdatePresence(void)
// Grab the host's IP for joining. // Grab the host's IP for joining.
if ((join = DRPC_GetServerIP()) != NULL) if ((join = DRPC_GetServerIP()) != NULL)
{ {
char *xorjoin = DRPC_XORIPString(join); discordPresence.joinSecret = DRPC_XORIPString(join);
discordPresence.joinSecret = xorjoin;
free(xorjoin);
joinSecretSet = true; joinSecretSet = true;
} }
else else