redstrate/sm64
1
Fork 0
Code Activity

Fixed compilation of .cpp files on systems other than windows (#34)

Browse source 
* Fixed compilation of .cpp files on systems other than windows

* FIxed C++ linking for platforms other than Windows

* Links with C++ only if there are any C++ files
This commit is contained in:
niansa/tuxifan 2021-02-24 18:40:14 +01:00 • committed by GitHub
parent 73a093348e
commit 2ed7dfe046
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -282,10 +282,6 @@ endif
GENERATED_C_FILES := $(BUILD_DIR)/assets/mario_anim_data.c $(BUILD_DIR)/assets/demo_data.c \ GENERATED_C_FILES := $(BUILD_DIR)/assets/mario_anim_data.c $(BUILD_DIR)/assets/demo_data.c \
$(addprefix $(BUILD_DIR)/bin/,$(addsuffix _skybox.c,$(notdir $(basename $(wildcard textures/skyboxes/*.png))))) $(addprefix $(BUILD_DIR)/bin/,$(addsuffix _skybox.c,$(notdir $(basename $(wildcard textures/skyboxes/*.png)))))
ifeq ($(TARGET_WINDOWS),0)
CXX_FILES :=
endif
ifneq ($(TARGET_N64),1) ifneq ($(TARGET_N64),1)
ULTRA_C_FILES := \ ULTRA_C_FILES := \
alBnkfNew.c \ alBnkfNew.c \
@ -430,10 +426,10 @@ ifneq ($(TARGET_WEB),1)
else else
CC := emcc CC := emcc
endif endif
ifeq ($(TARGET_WINDOWS),1) ifeq ($(CXX_FILES),"")
LD := $(CXX)
else
LD := $(CC) LD := $(CC)
else
LD := $(CXX)
endif endif
CPP := cpp -P CPP := cpp -P
OBJDUMP := objdump OBJDUMP := objdump