Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Libretro
libretro-chailove
Commits
ec8a565a
Commit
ec8a565a
authored
Mar 17, 2020
by
Vladimir Serbinenko
Browse files
Fix 3ds compilation
parent
81002c59
Changes
5
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
ec8a565a
...
...
@@ -16,7 +16,11 @@ all: $(TARGET)
$(MAKE)
$(TARGET)
$(TARGET)
:
$(OBJECTS) | vendor/libretro-common/include/libretro.h
ifeq
($(STATIC_LINKING), 1)
$(AR)
rcs
$@
$(OBJECTS)
else
$(CXX)
-o
$@
$^
$(LDFLAGS)
endif
%.o
:
%.cpp | vendor/libretro-common/include/libretro.h
$(CXX)
-c
-o
$@
$<
$(CXXFLAGS)
...
...
Makefile.common
View file @
ec8a565a
...
...
@@ -49,6 +49,11 @@ ifneq ($(STATIC_LINKING), 1)
SOURCES_C
+=
$(CORE_DIR)
/vendor/libretro-common/utils/md5.c
endif
ifeq
($(platform), ctr)
SOURCES_C
+=
$(CORE_DIR)
/vendor/libretro-common/audio/audio_mix.c
\
$(CORE_DIR)
/vendor/libretro-common/audio/audio_mixer.c
endif
# stb_vorbis
#SOURCES_C += $(CORE_DIR)/vendor/stb/stb_vorbis.c
FLAGS
+=
-DHAVE_STB_VORBIS
...
...
Makefile.libretro
View file @
ec8a565a
...
...
@@ -190,11 +190,18 @@ else ifeq ($(platform), dos)
else
ifeq
($(platform), ctr)
TARGET
:=
$(TARGET_NAME)
_libretro_
$(platform)
.a
CC
=
$(DEVKITARM)
/bin/arm-none-eabi-gcc
$(EXE_EXT)
CXX
=
$(DEVKITARM)
/bin/arm-none-eabi-g++
$(EXE_EXT)
AR
=
$(DEVKITARM)
/bin/arm-none-eabi-ar
$(EXE_EXT)
AR
=
$(DEVKITARM)
/bin/arm-none-eabi-ar
$(EXE_EXT)
PLATFORM_DEFINES
:=
-DARM11
-D_3DS
CFLAGS
+=
-march
=
armv6k
-mtune
=
mpcore
-mfloat-abi
=
hard
CFLAGS
+=
-Wall
-mword-relocations
CFLAGS
+=
-fomit-frame-pointer
-fstrict-aliasing
-ffast-math
CFLAGS
+=
-I
$(DEVKITPRO)
/libctru/include
CXXFLAGS
+=
-march
=
armv6k
-mtune
=
mpcore
-mfloat-abi
=
hard
CXXFLAGS
+=
-Wall
-mword-relocations
CXXFLAGS
+=
-fomit-frame-pointer
-fstrict-aliasing
-ffast-math
CXXFLAGS
+=
-I
$(DEVKITPRO)
/libctru/include
STATIC_LINKING
=
1
EXTERNAL_ZLIB
=
1
...
...
src/libretro.cpp
View file @
ec8a565a
...
...
@@ -459,3 +459,9 @@ void retro_run(void) {
ChaiLove
::
environ_cb
(
RETRO_ENVIRONMENT_SHUTDOWN
,
0
);
}
}
#ifdef _3DS
extern
"C"
int
nanosleep
(
const
struct
timespec
*
req
,
struct
timespec
*
rem
)
{
return
0
;
}
#endif
src/love/window.cpp
View file @
ec8a565a
...
...
@@ -52,7 +52,7 @@ bool window::load(const config& conf) {
}
// Enable video buffering.
app
->
videoBuffer
=
(
u
nsigned
in
t
*
)
app
->
screen
->
pixels
;
app
->
videoBuffer
=
(
u
int32_
t
*
)
app
->
screen
->
pixels
;
// Set the title.
setTitle
(
conf
.
window
.
title
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment