Parcourir la Source

Fixed a regression : 3DS doesn't support gold.

Eiyeron Fulmincendii il y a 9 ans
Parent
commit
6397c72751
5 fichiers modifiés avec 14 ajouts et 2 suppressions
  1. 1 1
      Makefile
  2. 4 0
      platform/nspire/Logger.cpp
  3. 3 0
      platform/nspire/rules.mk
  4. 4 0
      platform/sfml/Logger.cpp
  5. 2 1
      platform/sfml/rules.mk

+ 1 - 1
Makefile

@@ -15,7 +15,7 @@ CFLAGS = $(CFLAGS_COMMON) -std=gnu11
 CPPFLAGS = $(CFLAGS_COMMON) -std=gnu++11
 
 LIBS = -lz
-LDFLAGS = 
+LDFLAGS =
 
 SRCS_C :=
 SRCS_CPP :=

+ 4 - 0
platform/nspire/Logger.cpp

@@ -2,6 +2,10 @@
 
 using namespace WalrusRPG;
 
+void Logger::init()
+{
+}
+
 void Logger::log(const char *fmt, ...)
 {
 }

+ 3 - 0
platform/nspire/rules.mk

@@ -4,6 +4,9 @@ SRCS_C += $(wildcard $(nspire_LOCAL_PATH)/platform/*.c)
 SRCS_CPP += $(wildcard $(nspire_LOCAL_PATH)/*.cpp)
 INCLUDE += $(nspire_LOCAL_PATH)/public
 
+LDFLAGS +=  -fuse-ld=gold
+
+
 CFLAGS_COMMON += -marm -DTARGET_NSPIRE=1
 YCM_EXTRA_CFLAGS := -m32 -I$(NDLESS_GIT)/ndless-sdk/include -I$(HOME)/.ndless/include
 

+ 4 - 0
platform/sfml/Logger.cpp

@@ -22,6 +22,10 @@ namespace
 // NOTE : I really wish there would be a better way to handle these stupid va_lists. So
 // much redundant code...
 
+void Logger::init()
+{
+}
+
 void Logger::log(const char *fmt, ...)
 {
     print_premessage("  [LOG]");

+ 2 - 1
platform/sfml/rules.mk

@@ -5,9 +5,10 @@ SRCS_CPP += $(wildcard $(sfml_LOCAL_PATH)/*.cpp)
 INCLUDE += $(sfml_LOCAL_PATH)/public
 
 LIBS += -lstdc++ -lsfml-window -lsfml-graphics -lsfml-system
+LDFLAGS +=  -fuse-ld=gold
 
-CFLAGS_COMMON += -DTARGET_SFML=1
 
+CFLAGS_COMMON += -DTARGET_SFML=1
 CC = gcc
 CPP = g++