etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-21 19:45:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added 32-bit Discord library for Windows

Browse source
This commit is contained in:
MysterD 2020-09-25 23:18:56 -07:00
parent 389ea20180
commit 469fa2ff33
4 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -79,6 +79,7 @@ sm64config.txt
!/assets/**/*custom*.bin !/assets/**/*custom*.bin
!/assets/**/*custom*/**/*.bin !/assets/**/*custom*/**/*.bin
!/lib/discordsdk/*.* !/lib/discordsdk/*.*
!/lib/discordsdk/x86/*.*
# visual studio # visual studio
build-windows-visual-studio/.vs build-windows-visual-studio/.vs

21
Makefile
View file

@ -118,6 +118,21 @@ ifneq ($(TARGET_BITS),0)
BITS := -m$(TARGET_BITS) BITS := -m$(TARGET_BITS)
endif endif
# Determine default windows target bits
ifeq ($(WINDOWS_BUILD), 1)
ifeq ($(TARGET_BITS), 0)
CPU_TYPE := $(firstword $(subst -, ,$(shell $(CC) -dumpmachine)))
ifeq ($(CPU_TYPE), x86_64)
TARGET_BITS := 64
else ifeq ($(CPU_TYPE), i686)
TARGET_BITS := 32
else ifeq ($(CPU_TYPE), mingw32)
TARGET_BITS := 32
endif
endif
endif
# Release (version) flag defs # Release (version) flag defs
ifeq ($(VERSION),jp) ifeq ($(VERSION),jp)
@ -435,7 +450,11 @@ RPC_LIBS :=
DISCORD_SDK_LIBS := DISCORD_SDK_LIBS :=
ifeq ($(DISCORD_SDK), 1) ifeq ($(DISCORD_SDK), 1)
ifeq ($(WINDOWS_BUILD),1) ifeq ($(WINDOWS_BUILD),1)
DISCORD_SDK_LIBS := lib/discordsdk/discord_game_sdk.dll ifeq ($(TARGET_BITS), 32)
DISCORD_SDK_LIBS := lib/discordsdk/x86/discord_game_sdk.dll
else
DISCORD_SDK_LIBS := lib/discordsdk/discord_game_sdk.dll
endif
else ifeq ($(OSX_BUILD),1) else ifeq ($(OSX_BUILD),1)
# needs testing # needs testing
DISCORD_SDK_LIBS := lib/discordsdk/discord_game_sdk.dylib DISCORD_SDK_LIBS := lib/discordsdk/discord_game_sdk.dylib

BIN
lib/discordsdk/x86/discord_game_sdk.dll Normal file
View file

Binary file not shown.

BIN
lib/discordsdk/x86/discord_game_sdk.dll.lib Normal file
View file

Binary file not shown.