Skip to content

Commit

Permalink
Update Makefiles.
Browse files Browse the repository at this point in the history
  • Loading branch information
gameblabla committed Nov 7, 2019
1 parent cc253b8 commit 5dcc509
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions Makefile.linux
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TARGET = pcsx4all
PORT = rs97
PORT = sdl

# If V=1 was passed to 'make', don't hide commands:
ifeq ($(V),1)
Expand Down Expand Up @@ -33,9 +33,9 @@ SDL_LIBS := $(shell $(SDL_CONFIG) --libs)
LDFLAGS = $(SDL_LIBS) -lSDL_mixer -lSDL_image -lpthread -lz -lshake

# We want the GCW Zero handheld's keybindings (for dev testing purposes)
C_ARCH = -march=native -DGCW_ZERO -DNOJOYSTICK_AVAILABLE -DNO_HWSCALE
C_ARCH = -march=native -DGCW_ZERO

CFLAGS = $(C_ARCH) -ggdb3 -O2 \
CFLAGS = $(C_ARCH) -ggdb3 -O0 \
-Wall -Wunused -Wpointer-arith \
-Wno-sign-compare -Wno-cast-align \
-Isrc -Isrc/spu/$(SPU) -D$(SPU) -Isrc/gpu/$(GPU) \
Expand All @@ -49,7 +49,7 @@ CFLAGS = $(C_ARCH) -ggdb3 -O2 \
# Convert plugin names to uppercase and make them CFLAG defines
CFLAGS += -D$(shell echo $(GPU) | tr a-z A-Z)
CFLAGS += -D$(shell echo $(SPU) | tr a-z A-Z)
CFLAGS += -std=gnu99
CFLAGS += -DGCW_ZERO -DRUMBLE -DRG350 -DSHMEM_MIRRORING

OBJDIRS = \
obj obj/gpu obj/gpu/$(GPU) obj/spu obj/spu/$(SPU) \
Expand Down Expand Up @@ -149,11 +149,11 @@ $(TARGET): $(OBJS)

obj/%.o: src/%.c
@echo Compiling $<...
$(HIDECMD)$(CC) $(CFLAGS) -c $< -o $@
$(HIDECMD)$(CC) -std=gnu99 $(CFLAGS) -c $< -o $@

obj/%.o: src/%.cpp
@echo Compiling $<...
$(HIDECMD)$(CXX) $(CXXFLAGS) -c $< -o $@
$(HIDECMD)$(CXX) -std=gnu++03 $(CXXFLAGS) -c $< -o $@

obj/%.o: src/%.s
@echo Compiling $<...
Expand Down
2 changes: 1 addition & 1 deletion Makefile.rg350_static
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ CFLAGS := $(C_ARCH) $(OPTS) -DTIME_IN_MSEC \
# Convert plugin names to uppercase and make them CFLAG defines
CFLAGS += -D$(shell echo $(GPU) | tr a-z A-Z)
CFLAGS += -D$(shell echo $(SPU) | tr a-z A-Z)
CFLAGS += -DUSE_BGR15 -DGCW_ZERO -DRUMBLE -DRG350 -DSHMEM_MIRRORING
CFLAGS += -DGCW_ZERO -DRUMBLE -DRG350 -DSHMEM_MIRRORING

ifdef RECOMPILER
CFLAGS += -DPSXREC -D$(RECOMPILER)
Expand Down

0 comments on commit 5dcc509

Please sign in to comment.