mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-27 23:37:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'master' into master"

Browse Source 
This reverts commit 4b68a21a7e17048ec5424ebbb7faa18d83c3fd53, reversing
changes made to 5e0f78e8a092c4a52c747493ae0badfec55282dd.
This commit is contained in:
meepingsnesroms 2017-12-25 18:27:59 -08:00
parent 4b68a21a7e
commit 5a4bd619ba
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -68,9 +68,6 @@ menu/driverspzarch.c
*.rpx *.rpx
wiiu/wut/elf2rpl/elf2rpl wiiu/wut/elf2rpl/elf2rpl
# 3ds
/.lst
# Ctags # Ctags
/tags /tags

14
Makefile.ctr
View File

@ -152,7 +152,7 @@ $(TARGET): $(TARGET_3DSX) $(TARGET_3DS) $(TARGET_CIA) $(TARGET).core
$(TARGET).3dsx: $(TARGET).elf $(TARGET).3dsx: $(TARGET).elf
$(TARGET).elf: $(OBJ) libretro_ctr.a $(TARGET).elf: $(OBJ) libretro_ctr.a
PREFIX := $(DEVKITARM)/bin/arm-none-eabi- PREFIX := $(DEVKITPRO)/devkitARM/bin/arm-none-eabi-
CC := $(PREFIX)gcc CC := $(PREFIX)gcc
CXX := $(PREFIX)g++ CXX := $(PREFIX)g++
@ -175,13 +175,13 @@ else
endif endif
%.o: %.vsh %.gsh %.o: %.vsh %.gsh
$(DEVKITARM)/bin/picasso $^ -o $*.shbin $(DEVKITPRO)/devkitARM/bin/picasso $^ -o $*.shbin
$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@ $(DEVKITPRO)/devkitARM/bin/bin2s $*.shbin | $(PREFIX)as -o $@
rm $*.shbin rm $*.shbin
%.o: %.vsh %.o: %.vsh
$(DEVKITARM)/bin/picasso $^ -o $*.shbin $(DEVKITPRO)/devkitARM/bin/picasso $^ -o $*.shbin
$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@ $(DEVKITPRO)/devkitARM/bin/bin2s $*.shbin | $(PREFIX)as -o $@
rm $*.shbin rm $*.shbin
%.o: %.cpp %.o: %.cpp
@ -202,7 +202,7 @@ endif
%.vsh: %.vsh:
$(TARGET).smdh: $(APP_ICON) $(TARGET).smdh: $(APP_ICON)
$(DEVKITARM)/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@ $(DEVKITPRO)/devkitARM/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
$(TARGET).3dsx: $(TARGET).elf $(TARGET).3dsx: $(TARGET).elf
ifeq ($(APP_BIG_TEXT_SECTION), 1) ifeq ($(APP_BIG_TEXT_SECTION), 1)
@ -210,7 +210,7 @@ ifeq ($(APP_BIG_TEXT_SECTION), 1)
else else
rm -f $(TARGET).xml rm -f $(TARGET).xml
endif endif
$(DEVKITARM)/bin/3dsxtool $< $@ $(_3DSXFLAGS) $(DEVKITPRO)/devkitARM/bin/3dsxtool $< $@ $(_3DSXFLAGS)
$(TARGET).elf: ctr/3dsx_custom_crt0.o $(TARGET).elf: ctr/3dsx_custom_crt0.o
$(LD) $(LDFLAGS) $(OBJ) $(LIBDIRS) $(LIBS) -o $@ $(LD) $(LDFLAGS) $(OBJ) $(LIBDIRS) $(LIBS) -o $@

12
Makefile.ctr.salamander
View File

@ -111,7 +111,7 @@ $(TARGET): $(TARGET_3DSX) $(TARGET_3DS) $(TARGET_CIA)
$(TARGET).3dsx: $(TARGET).elf $(TARGET).3dsx: $(TARGET).elf
$(TARGET).elf: $(OBJ) $(TARGET).elf: $(OBJ)
PREFIX := $(DEVKITARM)/bin/arm-none-eabi- PREFIX := $(DEVKITPRO)/devkitARM/bin/arm-none-eabi-
CC := $(PREFIX)gcc CC := $(PREFIX)gcc
CXX := $(PREFIX)g++ CXX := $(PREFIX)g++
@ -134,13 +134,13 @@ else
endif endif
%.o: %.vsh %.gsh %.o: %.vsh %.gsh
$(DEVKITARM)/bin/picasso $^ -o $*.shbin $(DEVKITPRO)/devkitARM/bin/picasso $^ -o $*.shbin
$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@ $(DEVKITPRO)/devkitARM/bin/bin2s $*.shbin | $(PREFIX)as -o $@
rm $*.shbin rm $*.shbin
%.o: %.vsh %.o: %.vsh
$(DEVKITARM)/bin/picasso $^ -o $*.shbin $(DEVKITPRO)/devkitARM/bin/picasso $^ -o $*.shbin
$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@ $(DEVKITPRO)/devkitARM/bin/bin2s $*.shbin | $(PREFIX)as -o $@
rm $*.shbin rm $*.shbin
%.o: %.cpp %.o: %.cpp
@ -161,7 +161,7 @@ endif
%.vsh: %.vsh:
$(TARGET).smdh: $(APP_ICON) $(TARGET).smdh: $(APP_ICON)
$(DEVKITARM)/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@ $(DEVKITPRO)/devkitARM/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
$(TARGET).3dsx: $(TARGET).elf $(TARGET).3dsx: $(TARGET).elf
ifeq ($(APP_BIG_TEXT_SECTION), 1) ifeq ($(APP_BIG_TEXT_SECTION), 1)

1
gfx/drivers_font/ctr_font.c
View File

@ -27,6 +27,7 @@
#include "../video_driver.h" #include "../video_driver.h"
#include "../common/ctr_common.h" #include "../common/ctr_common.h"
#include "../drivers/ctr_gu.h" #include "../drivers/ctr_gu.h"
#include "../../ctr/gpu_old.h"
#include "../../verbosity.h" #include "../../verbosity.h"

1
menu/drivers_display/menu_display_ctr.c
View File

@ -26,6 +26,7 @@
#include "../../gfx/video_driver.h" #include "../../gfx/video_driver.h"
#include "../../gfx/common/ctr_common.h" #include "../../gfx/common/ctr_common.h"
#include "../../gfx/drivers/ctr_gu.h" #include "../../gfx/drivers/ctr_gu.h"
#include "../../ctr/gpu_old.h"
static const float *menu_display_ctr_get_default_vertices(void) static const float *menu_display_ctr_get_default_vertices(void)
{ {