Add "make citra" Makefile rule

This commit is contained in:
Pk11
2021-07-21 01:08:44 -05:00
parent b4a9cffd9b
commit b1796023ab
2 changed files with 11 additions and 3 deletions
+6 -2
View File
@@ -116,7 +116,7 @@ CFLAGS := -g -Wall -Wno-psabi -O2 -mword-relocations \
CFLAGS += $(INCLUDE) -DARM11 -D_3DS -D_GNU_SOURCE=1
CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++17
CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++17 $(CITRA)
ASFLAGS := -g $(ARCH)
LDFLAGS = -specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
@@ -220,12 +220,16 @@ ifneq ($(ROMFS),)
export _3DSXFLAGS += --romfs=$(CURDIR)/$(ROMFS)
endif
.PHONY: all clean cppcheck
.PHONY: all citra clean cppcheck
#---------------------------------------------------------------------------------
all: $(BUILD) $(GFXBUILD) $(DEPSDIR) $(ROMFS_T3XFILES) $(T3XHFILES)
@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
#---------------------------------------------------------------------------------
citra: $(BUILD) $(GFXBUILD) $(DEPSDIR) $(ROMFS_T3XFILES) $(T3XHFILES)
@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile CITRA=-DCITRA
#------------------------------------------------------------------------------
clean:
@echo clean ...
+5 -1
View File
@@ -439,7 +439,11 @@ Result downloadFromRelease(const std::string &url, const std::string &asset, con
@return True if Wi-Fi is connected; false if not.
*/
bool checkWifiStatus(void) {
return true; // For citra.
#ifdef CITRA
// Citra's Wi-Fi check doesn't work
return true;
#endif
u32 wifiStatus;
bool res = false;