Skip to content

Commit

Permalink
Fixes 2 player controls in libsnes FCEUmm; New folder structure
Browse files Browse the repository at this point in the history
  • Loading branch information
TwinAphex51224 committed Nov 28, 2011
1 parent 6c0e47d commit b2c0f30
Show file tree
Hide file tree
Showing 828 changed files with 546 additions and 2,344 deletions.
29 changes: 20 additions & 9 deletions src/libsnes-fceumm/Makefile → Makefile.libsnes-fceumm
View file
@@ -1,3 +1,5 @@
DEBUG = 0

ifeq ($(platform),) ifeq ($(platform),)
platform = unix platform = unix
ifeq ($(shell uname -a),) ifeq ($(shell uname -a),)
Expand All @@ -14,7 +16,7 @@ endif
ifeq ($(platform), unix) ifeq ($(platform), unix)
TARGET := libsnes.so TARGET := libsnes.so
fpic := -fPIC fpic := -fPIC
SHARED := -shared -Wl,--version-script=link.T SHARED := -shared -Wl,--version-script=libsnes-fceumm/link.T
else ifeq ($(platform), osx) else ifeq ($(platform), osx)
TARGET := libsnes.dylib TARGET := libsnes.dylib
fpic := -fPIC fpic := -fPIC
Expand All @@ -23,28 +25,37 @@ else
TARGET := snes.dll TARGET := snes.dll
CC = gcc CC = gcc
CXX = g++ CXX = g++
SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=link.T SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=libsnes-fceumm/link.T
endif

ifeq ($(DEBUG), 1)
CFLAGS += -O0 -g
CXXFLAGS += -O0 -g
else
CFLAGS += -O3
CXXFLAGS += -O3
endif endif


FCEU_DIR := ../fceumm LIBSNES_DIR := ./libsnes-fceumm
UTILS_DIR := ../../utils FCEU_DIR := ./src-fceumm
UTILS_DIR := ./utils


FCEU_SRC_DIRS := $(FCEU_DIR) $(FCEU_DIR)/boards $(FCEU_DIR)/input $(FCEU_DIR)/mappers $(FCEU_DIR)/utils $(UTILS_DIR)/zlib FCEU_SRC_DIRS := $(LIBSNES_DIR) $(FCEU_DIR) $(FCEU_DIR)/boards $(FCEU_DIR)/input $(FCEU_DIR)/mappers $(FCEU_DIR)/utils $(UTILS_DIR)/zlib


FCEU_CXXSRCS := $(foreach dir,$(FCEU_SRC_DIRS),$(wildcard $(dir)/*.cpp)) FCEU_CXXSRCS := $(foreach dir,$(FCEU_SRC_DIRS),$(wildcard $(dir)/*.cpp))
FCEU_CXXOBJ := $(FCEU_CXXSRCS:.cpp=.o) FCEU_CXXOBJ := $(FCEU_CXXSRCS:.cpp=.o)
FCEU_CSRCS := $(foreach dir,$(FCEU_SRC_DIRS),$(wildcard $(dir)/*.c)) FCEU_CSRCS := $(foreach dir,$(FCEU_SRC_DIRS),$(wildcard $(dir)/*.c))
FCEU_COBJ := $(FCEU_CSRCS:.c=.o) FCEU_COBJ := $(FCEU_CSRCS:.c=.o)


OBJS := $(FCEU_COBJ) $(FCEU_CXXOBJ) libsnes.o memstream.o OBJS := $(FCEU_COBJ) $(FCEU_CXXOBJ)


FCEU_DEFINES := -D__LIBSNES__ -DSOUND_QUALITY=0 -DPATH_MAX=1024 -DPSS_STYLE=1 -DLSB_FIRST=1 -DLOCAL_LE=1 FCEU_DEFINES := -D__LIBSNES__ -DSOUND_QUALITY=0 -DPATH_MAX=1024 -DPSS_STYLE=1 -DLSB_FIRST=1 -DLOCAL_LE=1


CFLAGS += -O3 -std=gnu99 $(fpic) -Wno-write-strings $(FCEU_DEFINES) CFLAGS += -std=gnu99 $(fpic) -Wno-write-strings $(FCEU_DEFINES)
CXXFLAGS += -O3 $(fpic) -Wno-write-strings $(FCEU_DEFINES) CXXFLAGS += $(fpic) -Wno-write-strings $(FCEU_DEFINES)
LDFLAGS += -Wl,-no-undefined LDFLAGS += -Wl,-no-undefined


INCDIRS := -I. -I$(FCEU_DIR) -I$(UTILS_DIR)/zlib INCDIRS := -I$(LIBSNES_DIR) -I$(FCEU_DIR) -I$(FCEU_DIR)/input -I$(FCEU_DIR)/boards -I$(FCEU_DIR)/mappers -I$(UTILS_DIR)/zlib
LIBS := LIBS :=


$(TARGET): $(OBJS) $(TARGET): $(OBJS)
Expand Down
27 changes: 19 additions & 8 deletions src/libsnes/Makefile → Makefile.libsnes-fceux
View file
@@ -1,3 +1,5 @@
DEBUG=0

ifeq ($(platform),) ifeq ($(platform),)
platform = unix platform = unix
ifeq ($(shell uname -a),) ifeq ($(shell uname -a),)
Expand All @@ -14,7 +16,7 @@ endif
ifeq ($(platform), unix) ifeq ($(platform), unix)
TARGET := libsnes.so TARGET := libsnes.so
fpic := -fPIC fpic := -fPIC
SHARED := -shared -Wl,--version-script=link.T SHARED := -shared -Wl,--version-script=libsnes-fceux/link.T
else ifeq ($(platform), osx) else ifeq ($(platform), osx)
TARGET := libsnes.dylib TARGET := libsnes.dylib
fpic := -fPIC fpic := -fPIC
Expand All @@ -23,25 +25,34 @@ else
TARGET := snes.dll TARGET := snes.dll
CC = gcc CC = gcc
CXX = g++ CXX = g++
SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=link.T SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=libsnes-fceux/link.T
endif

ifeq ($(DEBUG), 1)
CFLAGS += -O0 -g
CXXFLAGS += -O0 -g
else
CFLAGS += -O3
CXXFLAGS += -O3
endif endif


FCEU_DIR := ../fceu LIBSNES_DIR := ./libsnes-fceux
UTILS_DIR := ../../utils FCEU_DIR := ./src-fceux
UTILS_DIR := ./utils


FCEU_SRC_DIRS := $(FCEU_DIR) $(FCEU_DIR)/boards $(FCEU_DIR)/input $(FCEU_DIR)/mappers $(FCEU_DIR)/utils $(UTILS_DIR)/zlib $(UTILS_DIR)/unzip FCEU_SRC_DIRS := $(LIBSNES_DIR) $(FCEU_DIR) $(FCEU_DIR)/boards $(FCEU_DIR)/input $(FCEU_DIR)/mappers $(FCEU_DIR)/utils $(UTILS_DIR)/zlib $(UTILS_DIR)/unzip


FCEU_CXXSRCS := $(foreach dir,$(FCEU_SRC_DIRS),$(wildcard $(dir)/*.cpp)) FCEU_CXXSRCS := $(foreach dir,$(FCEU_SRC_DIRS),$(wildcard $(dir)/*.cpp))
FCEU_CXXOBJ := $(FCEU_CXXSRCS:.cpp=.o) FCEU_CXXOBJ := $(FCEU_CXXSRCS:.cpp=.o)
FCEU_CSRCS := $(foreach dir,$(FCEU_SRC_DIRS),$(wildcard $(dir)/*.c)) FCEU_CSRCS := $(foreach dir,$(FCEU_SRC_DIRS),$(wildcard $(dir)/*.c))
FCEU_COBJ := $(FCEU_CSRCS:.c=.o) FCEU_COBJ := $(FCEU_CSRCS:.c=.o)


OBJS := $(FCEU_COBJ) $(FCEU_CXXOBJ) libsnes.o OBJS := $(FCEU_COBJ) $(FCEU_CXXOBJ)


FCEU_DEFINES := -D__LIBSNES__ -DSOUND_QUALITY=0 -DPATH_MAX=1024 -DPSS_STYLE=1 -DLSB_FIRST=1 -DLOCAL_LE=1 FCEU_DEFINES := -D__LIBSNES__ -DSOUND_QUALITY=0 -DPATH_MAX=1024 -DPSS_STYLE=1 -DLSB_FIRST=1 -DLOCAL_LE=1


CFLAGS += -O3 -g -std=gnu99 $(fpic) -Wno-write-strings $(FCEU_DEFINES) CFLAGS += -std=gnu99 $(fpic) -Wno-write-strings $(FCEU_DEFINES)
CXXFLAGS += -O3 -g $(fpic) -Wno-write-strings $(FCEU_DEFINES) CXXFLAGS += $(fpic) -Wno-write-strings $(FCEU_DEFINES)
LDFLAGS += -Wl,-no-undefined LDFLAGS += -Wl,-no-undefined


INCDIRS := -I$(FCEU_DIR) -I$(UTILS_DIR)/zlib -I$(UTILS_DIR)/unzip INCDIRS := -I$(FCEU_DIR) -I$(UTILS_DIR)/zlib -I$(UTILS_DIR)/unzip
Expand Down
41 changes: 19 additions & 22 deletions Makefile → Makefile.ps3
View file
Expand Up @@ -4,13 +4,11 @@ CELL_DEBUG_FPS = 0
CELL_DEBUG_LOGGER = 0 CELL_DEBUG_LOGGER = 0
CELL_DEBUG_PRINTF = 0 CELL_DEBUG_PRINTF = 0
CELL_DEBUG_PRINTF_DELAY = 700000 CELL_DEBUG_PRINTF_DELAY = 700000
CELL_DEBUG_IP = \"192.168.1.7\"
CELL_DEBUG_PORT = 3490
MULTIMAN_SUPPORT = 0 MULTIMAN_SUPPORT = 0
SDK_340 = 1 SDK_340 = 1


#specify build tools #specify build tools
CELL_BUILD_TOOLS = GCC CELL_BUILD_TOOLS = SNC
#explicitly set some cell sdk defaults #explicitly set some cell sdk defaults
CELL_SDK ?= /usr/local/cell CELL_SDK ?= /usr/local/cell
# CELL_GPU_TYPE (currently RSX is only one option) # CELL_GPU_TYPE (currently RSX is only one option)
Expand All @@ -26,20 +24,20 @@ include $(CELL_MK_DIR)/sdk.makedef.mk


# Geohot CFW defines # Geohot CFW defines
MKSELF_GEOHOT = make_self_npdrm MKSELF_GEOHOT = make_self_npdrm
MKPKG_PSLIGHT = buildtools/PS3Py/pkg.py MKPKG_PSLIGHT = ps3/buildtools/PS3Py/pkg.py
PKG_FINALIZE = package_finalize PKG_FINALIZE = package_finalize


STRIP = $(CELL_HOST_PATH)/ppu/bin/ppu-lv2-strip STRIP = $(CELL_HOST_PATH)/ppu/bin/ppu-lv2-strip


# important directories # important directories
UTILS_DIR = ./utils UTILS_DIR = ./utils
SRC_DIR = ./src SRC_DIR = ./ps3
CELL_FRAMEWORK_DIR = ./src/cellframework CELL_FRAMEWORK_DIR = ./ps3/cellframework
CELL_FRAMEWORK2_DIR = ./src/cellframework2 CELL_FRAMEWORK2_DIR = ./ps3/cellframework2
FCEU_API_DIR = ./src/fceumm FCEU_API_DIR = ./src-fceumm


EMULATOR_VERSION = 1.6 EMULATOR_VERSION = 1.6
PPU_OPTIMIZE_LV := -O2 PPU_OPTIMIZE_LV := -O2


# all source directories # all source directories
SOURCES = $(SRC_DIR) \ SOURCES = $(SRC_DIR) \
Expand Down Expand Up @@ -116,10 +114,9 @@ $(FCEU_API_DIR)/x6502.c
PPU_SRCS += $(foreach dir,$(SOURCES_LAST),$(wildcard $(dir)/*.cpp)) $(foreach dir,$(SOURCES_LAST),$(wildcard $(dir)/*.c)) PPU_SRCS += $(foreach dir,$(SOURCES_LAST),$(wildcard $(dir)/*.cpp)) $(foreach dir,$(SOURCES_LAST),$(wildcard $(dir)/*.c))


PPU_TARGET = fceu-ps3.ppu.elf PPU_TARGET = fceu-ps3.ppu.elf

DEFINES += -I. -I$(FCEU_API_DIR) -I$(UTILS_DIR)/zlib -DPSS_STYLE=1 -DPSGL -DPATH_MAX=1024 -DNDEBUG=1 -DSOUND_QUALITY=0

PPU_CXXFLAGS += $(DEFINES)
PPU_CXXFLAGS += -I. -I$(FCEU_API_DIR) -I$(UTILS_DIR)/zlib -DPSS_STYLE=1 -DPSGL -DPATH_MAX=1024 -DNDEBUG=1 -DSOUND_QUALITY=0 PPU_CFLAGS += $(DEFINES)
PPU_CFLAGS += -I. -I$(FCEU_API_DIR) -I$(UTILS_DIR)/zlib -DPSS_STYLE=1 -DPSGL -DPATH_MAX=1024 -DNDEBUG=1 -DSOUND_QUALITY=0


ifeq ($(CELL_BUILD_TOOLS),SNC) ifeq ($(CELL_BUILD_TOOLS),SNC)
PPU_CFLAGS += -Xbranchless=1 -Xfastmath=1 -Xassumecorrectsign=1 -Xassumecorrectalignment=1 \ PPU_CFLAGS += -Xbranchless=1 -Xfastmath=1 -Xassumecorrectsign=1 -Xassumecorrectalignment=1 \
Expand All @@ -144,29 +141,29 @@ include $(CELL_MK_DIR)/sdk.target.mk
.PHONY: pkg .PHONY: pkg
pkg: $(PPU_TARGET) pkg: $(PPU_TARGET)
ifeq ($(MULTIMAN_SUPPORT),1) ifeq ($(MULTIMAN_SUPPORT),1)
$(MKFSELF_WC) $(PPU_TARGET) pkg/USRDIR/RELOAD.SELF $(MKFSELF_WC) $(PPU_TARGET) ps3/pkg/USRDIR/RELOAD.SELF
else else
$(MAKE_FSELF_NPDRM) $(PPU_TARGET) pkg/USRDIR/EBOOT.BIN $(MAKE_FSELF_NPDRM) $(PPU_TARGET) ps3/pkg/USRDIR/EBOOT.BIN
endif endif
$(MAKE_PACKAGE_NPDRM) pkg/package.conf pkg $(MAKE_PACKAGE_NPDRM) ps3/pkg/package.conf ps3/pkg


#massively reduced filesize using MKSELF_GEOHOT - use this for normal jailbreak builds #massively reduced filesize using MKSELF_GEOHOT - use this for normal jailbreak builds
.PHONY: pkg-signed .PHONY: pkg-signed
pkg-signed: $(PPU_TARGET) pkg-signed: $(PPU_TARGET)
ifeq ($(MULTIMAN_SUPPORT),1) ifeq ($(MULTIMAN_SUPPORT),1)
$(MKFSELF_WC) $(PPU_TARGET) pkg/USRDIR/RELOAD.SELF $(MKFSELF_WC) $(PPU_TARGET) ps3/pkg/USRDIR/RELOAD.SELF
else else
$(MKSELF_GEOHOT) $(PPU_TARGET) pkg/USRDIR/EBOOT.BIN FCEU90000 $(MKSELF_GEOHOT) $(PPU_TARGET) ps3/pkg/USRDIR/EBOOT.BIN FCEU90000
endif endif
$(PYTHONBIN) $(MKPKG_PSLIGHT) --contentid IV0002-FCEU90000_00-SAMPLE0000000001 pkg/ fceunext-ps3-v$(EMULATOR_VERSION)-fw3.41.pkg $(PYTHONBIN) $(MKPKG_PSLIGHT) --contentid IV0002-FCEU90000_00-SAMPLE0000000001 ps3/pkg/ fceunext-ps3-v$(EMULATOR_VERSION)-fw3.41.pkg


#use this to create a PKG for use with Geohot CFW 3.55 #use this to create a PKG for use with Geohot CFW 3.55
.PHONY: pkg-signed-cfw .PHONY: pkg-signed-cfw
pkg-signed-cfw: pkg-signed-cfw:
ifeq ($(MULTIMAN_SUPPORT),1) ifeq ($(MULTIMAN_SUPPORT),1)
$(MKFSELF_WC) $(PPU_TARGET) pkg/USRDIR/RELOAD.SELF $(MKFSELF_WC) $(PPU_TARGET) ps3/pkg/USRDIR/RELOAD.SELF
else else
$(MKSELF_GEOHOT) $(PPU_TARGET) pkg/USRDIR/EBOOT.BIN.SELF FCEU90000 $(MKSELF_GEOHOT) $(PPU_TARGET) ps3/pkg/USRDIR/EBOOT.BIN.SELF FCEU90000
endif endif
$(PYTHONBIN) $(MKPKG_PSLIGHT) --contentid IV0002-FCEU90000_00-SAMPLE0000000001 pkg/ fceunext-ps3-v$(EMULATOR_VERSION)-cfw3.55.pkg $(PYTHONBIN) $(MKPKG_PSLIGHT) --contentid IV0002-FCEU90000_00-SAMPLE0000000001 ps3/pkg/ fceunext-ps3-v$(EMULATOR_VERSION)-cfw3.55.pkg
$(PKG_FINALIZE) fceunext-ps3-v$(EMULATOR_VERSION)-cfw3.55.pkg $(PKG_FINALIZE) fceunext-ps3-v$(EMULATOR_VERSION)-cfw3.55.pkg
19 changes: 0 additions & 19 deletions PS3-FCEU-CHANGELOG.txt
View file

This file was deleted.

0 comments on commit b2c0f30

Please sign in to comment.