notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainline' into libretro
[pcsx_rearmed.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
0a3b1fe
..
29f02fd
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-2,8
+2,10
@@
# default stuff goes here, so that config can override
TARGET ?= pcsx
# default stuff goes here, so that config can override
TARGET ?= pcsx
-CFLAGS += -Wall -ggdb -Iinclude -ffast-math
-ifndef DEBUG
+CFLAGS += -Wall -Iinclude -ffast-math
+ifeq ($(DEBUG), 1)
+CFLAGS += -O0 -ggdb
+else
CFLAGS += -O2 -DNDEBUG
endif
CXXFLAGS += $(CFLAGS)
CFLAGS += -O2 -DNDEBUG
endif
CXXFLAGS += $(CFLAGS)
@@
-194,6
+196,7
@@
endif
ifeq "$(PLATFORM)" "libretro"
OBJS += frontend/libretro.o
CFLAGS += -DFRONTEND_SUPPORTS_RGB565
ifeq "$(PLATFORM)" "libretro"
OBJS += frontend/libretro.o
CFLAGS += -DFRONTEND_SUPPORTS_RGB565
+CFLAGS += -DHAVE_LIBRETRO
ifeq ($(MMAP_WIN32),1)
OBJS += libpcsxcore/memmap_win32.o
ifeq ($(MMAP_WIN32),1)
OBJS += libpcsxcore/memmap_win32.o
@@
-246,11
+249,19
@@
frontend/revision.h: FORCE
%.o: %.S
$(CC_AS) $(CFLAGS) -c $^ -o $@
%.o: %.S
$(CC_AS) $(CFLAGS) -c $^ -o $@
+%.o: %.cpp
+ $(CXX) $(CXXFLAGS) -c -o $@ $<
+
+
target_: $(TARGET)
$(TARGET): $(OBJS)
target_: $(TARGET)
$(TARGET): $(OBJS)
+ifeq ($(STATIC_LINKING), 1)
+ $(AR) rcs $@ $(OBJS)
+else
$(CC_LINK) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(EXTRA_LDFLAGS)
$(CC_LINK) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(EXTRA_LDFLAGS)
+endif
clean: $(PLAT_CLEAN) clean_plugins
$(RM) $(TARGET) $(OBJS) $(TARGET).map frontend/revision.h
clean: $(PLAT_CLEAN) clean_plugins
$(RM) $(TARGET) $(OBJS) $(TARGET).map frontend/revision.h