notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Attempt two to fix PSP
[picodrive.git]
/
Makefile.libretro
diff --git
a/Makefile.libretro
b/Makefile.libretro
index
4d34134
..
306c8af
100644
(file)
--- a/
Makefile.libretro
+++ b/
Makefile.libretro
@@
-23,6
+23,7
@@
AS ?= as
CC_AS ?= $(CC)
CFLAGS ?=
CC_AS ?= $(CC)
CFLAGS ?=
+STATIC_LINKING:= 0
TARGET_NAME := picodrive
LIBM := -lm
GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
TARGET_NAME := picodrive
LIBM := -lm
GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
@@
-34,14
+35,19
@@
asm_memory = 0
asm_render = 0
asm_ym2612 = 0
asm_misc = 0
asm_render = 0
asm_ym2612 = 0
asm_misc = 0
-asm_cdpico = 0
asm_cdmemory = 0
asm_mix = 0
fpic :=
asm_cdmemory = 0
asm_mix = 0
fpic :=
+
+ifeq ($(STATIC_LINKING),1)
+EXT=a
+endif
+
# Unix
ifeq ($(platform), unix)
# Unix
ifeq ($(platform), unix)
- TARGET := $(TARGET_NAME)_libretro.so
+ EXT ?= so
+ TARGET := $(TARGET_NAME)_libretro.$(EXT)
fpic := -fPIC
SHARED := -shared
DONT_COMPILE_IN_ZLIB = 1
fpic := -fPIC
SHARED := -shared
DONT_COMPILE_IN_ZLIB = 1
@@
-49,7
+55,8
@@
ifeq ($(platform), unix)
# Portable Linux
else ifeq ($(platform), linux-portable)
# Portable Linux
else ifeq ($(platform), linux-portable)
- TARGET := $(TARGET_NAME)_libretro.so
+ EXT ?= so
+ TARGET := $(TARGET_NAME)_libretro.$(EXT)
SHARED := -shared -nostdlib
fpic := -fPIC
LIBM :=
SHARED := -shared -nostdlib
fpic := -fPIC
LIBM :=
@@
-58,7
+65,8
@@
else ifeq ($(platform), linux-portable)
# OS X
else ifeq ($(platform), osx)
# OS X
else ifeq ($(platform), osx)
- TARGET := $(TARGET_NAME)_libretro.dylib
+ EXT ?= dylib
+ TARGET := $(TARGET_NAME)_libretro.$(EXT)
SHARED := -dynamiclib
fpic := -fPIC
APPLE := 1
SHARED := -dynamiclib
fpic := -fPIC
APPLE := 1
@@
-437,16
+445,16
@@
ifeq ($(NO_MMAP),1)
endif
ifeq ($(ARM_ASM),1)
endif
ifeq ($(ARM_ASM),1)
- asm_memory = 1
- asm_render = 1
- asm_ym2612 = 1
- asm_misc = 1
- asm_cdpico = 1
- asm_cdmemory = 1
- asm_mix = 1
+asm_memory = 1
+asm_render = 1
+asm_ym2612 = 1
+asm_misc = 1
+asm_cdmemory = 1
+asm_mix = 1
endif
CFLAGS += $(fpic)
endif
CFLAGS += $(fpic)
+
ifeq ($(findstring Haiku,$(shell uname -a)),)
LDLIBS += $(LIBM)
endif
ifeq ($(findstring Haiku,$(shell uname -a)),)
LDLIBS += $(LIBM)
endif