Merge branch 'master' into no-addresses-in-code

Author: warmCabin

README

@@ -1,4 +1,4 @@
-FCEUX SDL 2.3.0 SDL README
+FCEUX SDL 2.4.0 SDL README
 ==========================
 Originally By Lukas Sabota (sf: punkrockguy318)
 Updated By mjbudd77
@@ -26,7 +26,7 @@ Table of Contents
 * cmake - Required to build fceux.
 * qt5 OR qt6  - (qt version >= 5.11 recommended)
 * liblua5.1 (optional) - Will statically link internally if the system cannot provide this.
-* libx264 (optional) - H.264 video encoder for avi recording
+* libx264 (optional) - H.264 video encoder for avi recording (recommended)
 * minizip  
 * zlib  
 * openGL

fceux.icns

@@ -20,6 +20,13 @@ echo "Number of Processors: $NPROC";
 
 INSTALL_PREFIX=/tmp/fceux
 
+# Clean build and packaging directories
+sudo rm -rf build;
+sudo rm -rf $INSTALL_PREFIX/fceux.app;
+
+# Remove windows specific DLLs so that they don't get installed
+find output -name *.dll -exec rm -f {} \;
+
 gcc --version
 
 echo '****************************************'

fceux1.png

@@ -18,4 +18,4 @@ You should get releases from here: https://sourceforge.net/projects/fceultra/fil
 
 That's because github forces us to use tags we don't have for releases.
 
-2.3.0 is the most recent release but most people are using the autobuilds.
+2.4.0 is the most recent release but most people are using the autobuilds.

icons/fceux.ico

@@ -554,8 +554,11 @@ install( TARGETS  ${APP_NAME}
 # Use \$ to defer expansion until install script is called; CPack will call it with its own CMAKE_INSTALL_PREFIX
 set(APP \${CMAKE_INSTALL_PREFIX}/${APP_NAME}.app)
 
+install( DIRECTORY ${CMAKE_SOURCE_DIR}/output/.
+	DESTINATION ${APP_NAME}.app/Contents/Resources COMPONENT Extra )
+
 set(CPACK_PACKAGE_ICON ${CMAKE_SOURCE_DIR}/fceux.icns )
-set(CPACK_GENERATOR "DRAGNDROP")
+set(CPACK_GENERATOR "DragNDrop")
 include(CPACK)
 
 # macdeployqt tool that comes with Qt: https://doc.qt.io/qt-5/macos-deployment.html#macdeploy

output/fceux.chm

@@ -41,6 +41,9 @@ const char *FCEUI_GetAboutString(void)
 		"FCEU TAS - blip & nitsuja\n"
 		"FCEU TAS+ - Luke Gustafson\n"
 		"\n"
+		"Logo/icon:\n"
+		"Terwilf\n"
+		"\n"
 		"FCEUX is dedicated to the fallen heroes\n"
 		"of NES emulation. In Memoriam --\n"
 		"ugetab\n"

pipelines/macOS_build.sh

@@ -76,7 +76,7 @@ AboutWindow::AboutWindow(QWidget *parent)
 	QPushButton *closeButton;
 	char stmp[256];
 
-	pm2 = pm.scaled( 64, 64 );
+	pm2 = pm.scaled( 128, 128 );
 
 	setWindowTitle( tr("About fceuX") );
 
@@ -93,13 +93,13 @@ AboutWindow::AboutWindow(QWidget *parent)
 
 	mainLayout->addLayout( hbox1 );
 
-	hbox1 = new QHBoxLayout();
-	lbl = new QLabel( tr("fceuX") );
+	//hbox1 = new QHBoxLayout();
+	//lbl = new QLabel( tr("fceuX") );
 
-	hbox1->addWidget( lbl );
-	hbox1->setAlignment( Qt::AlignCenter );
+	//hbox1->addWidget( lbl );
+	//hbox1->setAlignment( Qt::AlignCenter );
 
-	mainLayout->addLayout( hbox1 );
+	//mainLayout->addLayout( hbox1 );
 
 	hbox1 = new QHBoxLayout();
 	lbl = new QLabel( tr(FCEU_VERSION_STRING) );