Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Cpasjuste committed Mar 7, 2022
2 parents 9dd1662 + ca15739 commit 878b902
Show file tree
Hide file tree
Showing 210 changed files with 45,092 additions and 230,465 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pfbneo-linux-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ jobs:
libconfig-dev libglm-dev libfreetype6-dev libpng-dev libminizip-dev zlib1g-dev \
libvdpau-dev libva-dev libavcodec-dev libavfilter-dev libavformat-dev libavutil-dev \
libpostproc-dev libswresample-dev libswscale-dev libmpv-dev libass-dev libbz2-dev \
libfribidi-dev libphysfs-dev
libfribidi-dev libzip-dev libfuse-dev
# Build pfbneo
- name: Build pfbneo
run: |
cd $GITHUB_WORKSPACE
mkdir cmake-build && cd cmake-build
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_BUILTIN_LIBCONFIG=ON \
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON \
-DOPTION_EMU=pfbneo -DCMAKE_BUILD_TYPE=Debug ..
make pfbneo.deps
make -j $(getconf _NPROCESSORS_ONLN) pfbneo
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pfbneo-linux-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ jobs:
libconfig-dev libglm-dev libfreetype6-dev libpng-dev libminizip-dev zlib1g-dev \
libvdpau-dev libva-dev libavcodec-dev libavfilter-dev libavformat-dev libavutil-dev \
libpostproc-dev libswresample-dev libswscale-dev libmpv-dev libass-dev libbz2-dev \
libfribidi-dev libphysfs-dev
libfribidi-dev libzip-dev libfuse-dev
# Build pfbneo
- name: Build pfbneo
run: |
cd $GITHUB_WORKSPACE
mkdir cmake-build && cd cmake-build
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_BUILTIN_LIBCONFIG=ON \
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON \
-DOPTION_EMU=pfbneo -DCMAKE_BUILD_TYPE=Release ..
make pfbneo.deps
make -j $(getconf _NPROCESSORS_ONLN) pfbneo_linux_release
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pfbneo-ps4-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
cd $GITHUB_WORKSPACE
mkdir cmake-build && cd cmake-build
export OPENORBIS=/opt/pacbrew/ps4/openorbis
cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON -DOPTION_MPV_PLAYER=OFF \
cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON \
-DOPTION_EMU=pfbneo -DCMAKE_BUILD_TYPE=Debug ..
make pfbneo.deps
make -j $(getconf _NPROCESSORS_ONLN) pfbneo_pkg
2 changes: 1 addition & 1 deletion .github/workflows/pfbneo-ps4-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
cd $GITHUB_WORKSPACE
mkdir cmake-build && cd cmake-build
export OPENORBIS=/opt/pacbrew/ps4/openorbis
cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON -DOPTION_MPV_PLAYER=OFF \
cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON \
-DOPTION_EMU=pfbneo -DCMAKE_BUILD_TYPE=Release ..
make pfbneo.deps
make -j $(getconf _NPROCESSORS_ONLN) pfbneo_ps4_release
4 changes: 2 additions & 2 deletions .github/workflows/pnes-linux-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ jobs:
libconfig-dev libglm-dev libfreetype6-dev libpng-dev libminizip-dev zlib1g-dev \
libvdpau-dev libva-dev libavcodec-dev libavfilter-dev libavformat-dev libavutil-dev \
libpostproc-dev libswresample-dev libswscale-dev libmpv-dev libass-dev libbz2-dev \
libfribidi-dev libphysfs-dev
libfribidi-dev libzip-dev libfuse-dev
# Build pnes
- name: Build pnes
run: |
cd $GITHUB_WORKSPACE
mkdir cmake-build && cd cmake-build
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_BUILTIN_LIBCONFIG=ON \
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON \
-DOPTION_EMU=pnes -DCMAKE_BUILD_TYPE=Debug ..
make -j $(getconf _NPROCESSORS_ONLN) pnes
4 changes: 2 additions & 2 deletions .github/workflows/pnes-linux-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ jobs:
libconfig-dev libglm-dev libfreetype6-dev libpng-dev libminizip-dev zlib1g-dev \
libvdpau-dev libva-dev libavcodec-dev libavfilter-dev libavformat-dev libavutil-dev \
libpostproc-dev libswresample-dev libswscale-dev libmpv-dev libass-dev libbz2-dev \
libfribidi-dev libphysfs-dev
libfribidi-dev libzip-dev libfuse-dev
# Build pnes
- name: Build pnes
run: |
cd $GITHUB_WORKSPACE
mkdir cmake-build && cd cmake-build
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_BUILTIN_LIBCONFIG=ON \
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON \
-DOPTION_EMU=pnes -DCMAKE_BUILD_TYPE=Release ..
make -j $(getconf _NPROCESSORS_ONLN) pnes_linux_release
2 changes: 1 addition & 1 deletion .github/workflows/pnes-ps4-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ jobs:
cd $GITHUB_WORKSPACE
mkdir cmake-build && cd cmake-build
export OPENORBIS=/opt/pacbrew/ps4/openorbis
cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON -DOPTION_MPV_PLAYER=OFF \
cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON \
-DOPTION_EMU=pnes -DCMAKE_BUILD_TYPE=Debug ..
make -j $(getconf _NPROCESSORS_ONLN) pnes_pkg
2 changes: 1 addition & 1 deletion .github/workflows/pnes-ps4-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ jobs:
cd $GITHUB_WORKSPACE
mkdir cmake-build && cd cmake-build
export OPENORBIS=/opt/pacbrew/ps4/openorbis
cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON -DOPTION_MPV_PLAYER=OFF \
cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON \
-DOPTION_EMU=pnes -DCMAKE_BUILD_TYPE=Release ..
make -j $(getconf _NPROCESSORS_ONLN) pnes_ps4_release
4 changes: 2 additions & 2 deletions .github/workflows/psnes-linux-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ jobs:
libconfig-dev libglm-dev libfreetype6-dev libpng-dev libminizip-dev zlib1g-dev \
libvdpau-dev libva-dev libavcodec-dev libavfilter-dev libavformat-dev libavutil-dev \
libpostproc-dev libswresample-dev libswscale-dev libmpv-dev libass-dev libbz2-dev \
libfribidi-dev libphysfs-dev
libfribidi-dev libzip-dev libfuse-dev
# Build psnes
- name: Build psnes
run: |
cd $GITHUB_WORKSPACE
mkdir cmake-build && cd cmake-build
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_BUILTIN_LIBCONFIG=ON \
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON \
-DOPTION_EMU=psnes -DCMAKE_BUILD_TYPE=Debug ..
make -j $(getconf _NPROCESSORS_ONLN) psnes
4 changes: 2 additions & 2 deletions .github/workflows/psnes-linux-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ jobs:
libconfig-dev libglm-dev libfreetype6-dev libpng-dev libminizip-dev zlib1g-dev \
libvdpau-dev libva-dev libavcodec-dev libavfilter-dev libavformat-dev libavutil-dev \
libpostproc-dev libswresample-dev libswscale-dev libmpv-dev libass-dev libbz2-dev \
libfribidi-dev libphysfs-dev
libfribidi-dev libzip-dev libfuse-dev
# Build psnes
- name: Build psnes
run: |
cd $GITHUB_WORKSPACE
mkdir cmake-build && cd cmake-build
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON -DOPTION_BUILTIN_LIBCONFIG=ON \
cmake -G "Unix Makefiles" -DPLATFORM_LINUX=ON \
-DOPTION_EMU=psnes -DCMAKE_BUILD_TYPE=Release ..
make -j $(getconf _NPROCESSORS_ONLN) psnes_linux_release
2 changes: 1 addition & 1 deletion .github/workflows/psnes-ps4-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ jobs:
cd $GITHUB_WORKSPACE
mkdir cmake-build && cd cmake-build
export OPENORBIS=/opt/pacbrew/ps4/openorbis
cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON -DOPTION_MPV_PLAYER=OFF \
cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON \
-DOPTION_EMU=psnes -DCMAKE_BUILD_TYPE=Debug ..
make -j $(getconf _NPROCESSORS_ONLN) psnes_pkg
2 changes: 1 addition & 1 deletion .github/workflows/psnes-ps4-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ jobs:
cd $GITHUB_WORKSPACE
mkdir cmake-build && cd cmake-build
export OPENORBIS=/opt/pacbrew/ps4/openorbis
cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON -DOPTION_MPV_PLAYER=OFF \
cmake -G "Unix Makefiles" -DPLATFORM_PS4=ON \
-DOPTION_EMU=psnes -DCMAKE_BUILD_TYPE=Release ..
make -j $(getconf _NPROCESSORS_ONLN) psnes_ps4_release
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ add_subdirectory(sscrap)

# required for cmake toolchain setup
project(pemu)
set(PROJECT_AUTHOR Cpasjuste)
set(PROJECT_AUTHOR cpasjuste)
set(VERSION_MAJOR 5)
set(VERSION_MINOR 0)
set(VERSION_MINOR 1)

# pemu (ui)
add_subdirectory(ui)
Expand Down
11 changes: 1 addition & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@
[![pfbneo-linux-dev](https://github.com/Cpasjuste/pemu/actions/workflows/pfbneo-linux-dev.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/pfbneo-linux-dev.yml)
[![psnes-linux-dev](https://github.com/Cpasjuste/pemu/actions/workflows/psnes-linux-dev.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/psnes-linux-dev.yml)
[![pnes-linux-dev](https://github.com/Cpasjuste/pemu/actions/workflows/pnes-linux-dev.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/pnes-linux-dev.yml)
[![pfbneo-linux-release](https://github.com/Cpasjuste/pemu/actions/workflows/pfbneo-linux-release.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/pfbneo-linux-release.yml)
[![psnes-linux-release](https://github.com/Cpasjuste/pemu/actions/workflows/psnes-linux-release.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/psnes-linux-release.yml)
[![pnes-linux-release](https://github.com/Cpasjuste/pemu/actions/workflows/pnes-linux-release.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/pnes-linux-release.yml)

[![pfbneo-switch-dev](https://github.com/Cpasjuste/pemu/actions/workflows/pfbneo-switch-dev.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/pfbneo-switch-dev.yml)
[![psnes-switch-dev](https://github.com/Cpasjuste/pemu/actions/workflows/psnes-switch-dev.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/psnes-switch-dev.yml)
[![pnes-switch-dev](https://github.com/Cpasjuste/pemu/actions/workflows/pnes-switch-dev.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/pnes-switch-dev.yml)
[![pfbneo-switch-release](https://github.com/Cpasjuste/pemu/actions/workflows/pfbneo-switch-release.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/pfbneo-switch-release.yml)
[![psnes-switch-release](https://github.com/Cpasjuste/pemu/actions/workflows/psnes-switch-release.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/psnes-switch-release.yml)
[![pnes-switch-release](https://github.com/Cpasjuste/pemu/actions/workflows/pnes-switch-release.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/pnes-switch-release.yml)

[![pfbneo-ps4-dev](https://github.com/Cpasjuste/pemu/actions/workflows/pfbneo-ps4-dev.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/pfbneo-ps4-dev.yml)
[![psnes-ps4-dev](https://github.com/Cpasjuste/pemu/actions/workflows/psnes-ps4-dev.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/psnes-ps4-dev.yml)
[![pnes-ps4-dev](https://github.com/Cpasjuste/pemu/actions/workflows/pnes-ps4-dev.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/pnes-ps4-dev.yml)
[![pfbneo-ps4-release](https://github.com/Cpasjuste/pemu/actions/workflows/pfbneo-ps4-release.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/pfbneo-ps4-release.yml)
[![psnes-ps4-release](https://github.com/Cpasjuste/pemu/actions/workflows/psnes-ps4-release.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/psnes-ps4-release.yml)
[![pnes-ps4-release](https://github.com/Cpasjuste/pemu/actions/workflows/pnes-ps4-release.yml/badge.svg)](https://github.com/Cpasjuste/pemu/actions/workflows/pnes-ps4-release.yml)
Expand All @@ -31,7 +22,7 @@
libconfig-dev libglm-dev libfreetype6-dev libpng-dev libminizip-dev zlib1g-dev \
libvdpau-dev libva-dev libavcodec-dev libavfilter-dev libavformat-dev libavutil-dev \
libpostproc-dev libswresample-dev libswscale-dev libmpv-dev libass-dev libbz2-dev \
libfribidi-dev libphysfs-dev
libfribidi-dev libzip-dev libfuse-dev
```
- clone pemu repository:
```
Expand Down
2 changes: 1 addition & 1 deletion cores/nestopia
Submodule nestopia updated 97 files
+2 −9 .gitignore
+30 −3 ChangeLog
+38 −46 Makefile.am
+69 −0 NstDatabase.xml
+4 −6 README.md
+5 −5 configure.ac
+ palettes/BMFFINR2.pal
+ palettes/BMFFINR3.pal
+ palettes/CXA2025AS-1536.pal
+ palettes/Composite Direct (FBX).pal
+ palettes/NES Classic (FBX-FS).pal
+ palettes/NES_Classic-FBX.pal
+ palettes/Nostalgia-FBX.pal
+ palettes/Original Hardware (FBX).pal
+ palettes/PVM Style (FBX).pal
+ palettes/PVM Style D93 (FBX).pal
+ palettes/SONY_CXA2025AS_US.pal
+ palettes/Smooth (FBX).pal
+ palettes/Unsaturated-Final.pal
+ palettes/Unsaturated-V5.pal
+ palettes/Unsaturated-V6.pal
+ palettes/Wavebeam.pal
+ palettes/YUV-V3.pal
+ palettes/hybrid.pal
+ palettes/nescap.pal
+ palettes/ntsc.pal
+15 −0 projects/core.vcproj
+4 −0 projects/core.vcxproj
+0 −22 source/common/cheats.h
+0 −257 source/common/input.cpp
+0 −37 source/common/input.h
+0 −6,136 source/common/png.cpp
+9 −3 source/core/NstApu.cpp
+9 −5 source/core/NstCpu.cpp
+65 −3 source/core/NstPpu.cpp
+7 −0 source/core/NstPpu.hpp
+125 −6 source/core/board/NstBoard.cpp
+18 −15 source/core/board/NstBoard.hpp
+167 −27 source/core/board/NstBoardKaiser.cpp
+38 −0 source/core/board/NstBoardKaiser.hpp
+9 −15 source/core/board/NstBoardMmc3.hpp
+1 −1 source/core/board/NstBoardMmc6.cpp
+7 −1 source/core/board/NstBoardTengenRambo1.cpp
+2 −1 source/core/board/NstBoardUnlCc21.cpp
+159 −0 source/core/board/NstBoardUnlMmc3BigPrgRom.cpp
+60 −0 source/core/board/NstBoardUnlMmc3BigPrgRom.hpp
+1 −0 source/core/board/NstBoardWaixing.hpp
+106 −0 source/core/board/NstBoardWaixingFs304.cpp
+63 −0 source/core/board/NstBoardWaixingFs304.hpp
+48 −32 source/fltkui/audio.cpp
+0 −0 source/fltkui/audio.h
+135 −67 source/fltkui/cheats.cpp
+36 −0 source/fltkui/cheats.h
+24 −24 source/fltkui/cli.cpp
+0 −0 source/fltkui/cli.h
+20 −27 source/fltkui/config.cpp
+4 −6 source/fltkui/config.h
+590 −0 source/fltkui/fltkui.cpp
+33 −0 source/fltkui/fltkui.h
+125 −0 source/fltkui/fltkui_archive.cpp
+6 −0 source/fltkui/fltkui_archive.h
+275 −0 source/fltkui/fltkui_cheats.cpp
+16 −0 source/fltkui/fltkui_cheats.h
+666 −0 source/fltkui/fltkui_config.cpp
+31 −0 source/fltkui/fltkui_config.h
+0 −0 source/fltkui/font.h
+0 −0 source/fltkui/homebrew.cpp
+0 −0 source/fltkui/homebrew.h
+0 −0 source/fltkui/ini.cpp
+0 −0 source/fltkui/ini.h
+515 −138 source/fltkui/input.cpp
+90 −60 source/fltkui/input.h
+117 −216 source/fltkui/nstcommon.cpp
+4 −5 source/fltkui/nstcommon.h
+6,497 −0 source/fltkui/png.cpp
+502 −191 source/fltkui/png.h
+19 −21 source/fltkui/samples.cpp
+0 −0 source/fltkui/samples.h
+95 −204 source/fltkui/video.cpp
+0 −9 source/fltkui/video.h
+0 −691 source/gtkui/gtkui.cpp
+0 −23 source/gtkui/gtkui.h
+0 −182 source/gtkui/gtkui_archive.cpp
+0 −8 source/gtkui/gtkui_archive.h
+0 −266 source/gtkui/gtkui_callbacks.cpp
+0 −41 source/gtkui/gtkui_callbacks.h
+0 −619 source/gtkui/gtkui_cheats.cpp
+0 −17 source/gtkui/gtkui_cheats.h
+0 −1,292 source/gtkui/gtkui_config.cpp
+0 −18 source/gtkui/gtkui_config.h
+0 −258 source/gtkui/gtkui_dialogs.cpp
+0 −18 source/gtkui/gtkui_dialogs.h
+0 −388 source/gtkui/gtkui_input.cpp
+0 −99 source/gtkui/gtkui_input.h
+4 −9 source/win32/NstDialogAbout.cpp
+634 −635 source/win32/language/language.rc
+0 −1 source/win32/language/resource.h
2 changes: 1 addition & 1 deletion libcross2d
Submodule libcross2d updated 318 files
24 changes: 14 additions & 10 deletions pfbneo/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ set(BURNER_DIRS
)
file(GLOB SRC_BURNER
${CMAKE_SOURCE_DIR}/cores/fbneo/src/burner/*.c*
${CMAKE_SOURCE_DIR}/cores/fbneo/src/burner/sdl/inpdipsw.cpp
${CMAKE_SOURCE_DIR}/cores/fbneo/src/burner/sdl/input_sdl2.cpp
${CMAKE_SOURCE_DIR}/cores/fbneo/src/burner/sdl/neocdlist.cpp
${CMAKE_SOURCE_DIR}/cores/fbneo/src/burner/sdl/stringset.cpp
)
list(REMOVE_ITEM SRC_BURNER
${CMAKE_SOURCE_DIR}/cores/fbneo/src/burner/conc.cpp
${CMAKE_SOURCE_DIR}/cores/fbneo/src/burner/cong.cpp
${CMAKE_SOURCE_DIR}/cores/fbneo/src/burner/dat.cpp
${CMAKE_SOURCE_DIR}/cores/fbneo/src/burner/gamc.cpp
${CMAKE_SOURCE_DIR}/cores/fbneo/src/burner/gami.cpp
${CMAKE_SOURCE_DIR}/cores/fbneo/src/burner/image.cpp
${CMAKE_SOURCE_DIR}/cores/fbneo/src/burner/sshot.cpp
${CMAKE_SOURCE_DIR}/cores/fbneo/src/burner/state.cpp
Expand Down Expand Up @@ -102,7 +102,6 @@ set(INTF_DIRS
)
file(GLOB SRC_INTF
${CMAKE_SOURCE_DIR}/cores/fbneo/src/intf/*.cpp
${CMAKE_SOURCE_DIR}/cores/fbneo/src/intf/input/*.cpp
${CMAKE_SOURCE_DIR}/cores/fbneo/src/intf/cd/*.cpp
${CMAKE_SOURCE_DIR}/cores/fbneo/src/intf/cd/sdl/*.cpp
${CMAKE_SOURCE_DIR}/cores/fbneo/src/intf/audio/*.cpp
Expand Down Expand Up @@ -208,9 +207,14 @@ set(FLAGS
-D__PFBA_VERSION_MAJOR__=${VERSION_MAJOR}
-D__PFBA_VERSION_MINOR__=${VERSION_MINOR}
-DINCLUDE_7Z_SUPPORT -DMINIZIP_LIB
-DUSE_SPEEDHACKS -DBUILD_SDL2 -DBUILD_M68K
-Wno-write-strings -Wno-narrowing -fforce-addr -finline-limit=1200 -Wno-sign-compare
-Wno-unused-variable -Wno-unused-but-set-variable -Wno-sequence-point
-DBUILD_SDL2 -DBUILD_M68K
-fomit-frame-pointer -Wno-write-strings
-Wall -Wno-long-long -Wno-sign-compare -Wno-uninitialized -Wno-unused
-Wno-conversion -Wno-attributes
-Wno-unused-parameter -Wno-unused-value
-Wno-format-truncation -Wno-parentheses -Wno-sequence-point
-Wno-format -Wno-misleading-indentation
-Wno-restrict -Wno-unused-result
)

set(CMAKE_CXX_STANDARD 17)
Expand All @@ -233,12 +237,12 @@ if (PLATFORM_VITA)
${VITASDK}/arm-vita-eabi/include/SDL2/
)
list(APPEND SRC_PFBA sources/cpu/c68000_intf.cpp sources/cpu/cyclone/Cyclone.s)
list(APPEND FLAGS -DBUILD_C68K -DUSE_FILE32API -DLSB_FIRST -D__PFBA_ARM__)
list(APPEND FLAGS -DBUILD_C68K -DUSE_FILE32API -DLSB_FIRST -DUSE_SPEEDHACKS -D__PFBA_ARM__)
list(APPEND LDFLAGS ScePower_stub pthread)
elseif (PLATFORM_PS4)
set(PS4_PKG_TITLE "pFBA - Portable Final Burn Neo")
set(PS4_PKG_TITLE "pFBN - Portable Final Burn Neo")
set(PS4_PKG_TITLE_ID "PFBN00001")
set(PS4_PKG_VERSION "05.00")
set(PS4_PKG_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}")
list(APPEND FLAGS -D__fastcall= -DLSB_FIRST)
list(APPEND LDFLAGS)
elseif (PLATFORM_PS3)
Expand Down Expand Up @@ -270,7 +274,7 @@ elseif (PLATFORM_3DS)
${DEVKITPRO}/libctru/include
${DEVKITPRO}/portlibs/armv6k/include)
list(APPEND FLAGS -DARM11 -D_3DS -D__3DS__
-DNO_KEYBOARD -D__PFBA_ARM__ -DUSE_FILE32API -DLSB_FIRST
-DNO_KEYBOARD -D__PFBA_ARM__ -DUSE_FILE32API -DLSB_FIRST -DUSE_SPEEDHACKS
-ffunction-sections -fomit-frame-pointer)
list(APPEND LDFLAGS
${DEVKITPRO}/portlibs/armv6k/lib/libpng.a
Expand Down
Loading

0 comments on commit 878b902

Please sign in to comment.