Update to v1.23 #300
Merged
Update to v1.23 #300
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ystems without haptic support (SDL >= 2.0.9)
Tell Windows that SDLPoP is DPI aware to prevent unwanted stretching
Tested on MacOS 10.14
CMake: Don't link SDL2main on Linux
Added more detail to MacOS developer section of the readme.
Fix linker error when building with newer clang
Expand buffer size to account for drawn_room type size.
screenshot.c: In function ‘draw_extras’:
screenshot.c:368:40: warning: ‘%d’ directive output may be truncated writing between 1 and 5 bytes into a region of size 4 [-Wformat-truncation=]
368 | snprintf(room_num, sizeof(room_num), "%d", drawn_room);
| ^~
screenshot.c:368:39: note: directive argument in the range [0, 65535]
368 | snprintf(room_num, sizeof(room_num), "%d", drawn_room);
| ^~~~
screenshot.c:368:2: note: ‘snprintf’ output between 2 and 6 bytes into a destination of size 4
368 | snprintf(room_num, sizeof(room_num), "%d", drawn_room);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
With modern GCC, the string trunction checks point out that it's
technically possible to hit large paths that would get truncated. Add
explicit checks to both silence the compiler warning and actually validate
the snprintf() results.
options.c: In function ‘check_mod_param’:
options.c:455:3: warning: ‘strncpy’ specified bound 256 equals destination size [-Wstringop-truncation]
455 | strncpy(levelset_name, mod_param, sizeof(levelset_name));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
options.c: In function ‘load_mod_options’:
options.c:680:50: warning: ‘%s’ directive output may be truncated writing up to 255 bytes into a region of size between 0 and 255 [-Wformat-truncation=]
680 | snprintf(folder_name, sizeof(folder_name), "%s/%s", mods_folder, levelset_name);
| ^~ ~~~~~~~~~~~~~
options.c:680:3: note: ‘snprintf’ output between 2 and 512 bytes into a destination of size 256
680 | snprintf(folder_name, sizeof(folder_name), "%s/%s", mods_folder, levelset_name);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
options.c:688:5: warning: ‘strncpy’ specified bound 256 equals destination size [-Wstringop-truncation]
688 | strncpy(mod_data_path, located_folder_name, sizeof(mod_data_path));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Also refactor the strncpy() uses into snprintf_check(). Overflows
from strncpy() would have resulted in a buggy behavior on overflow
(no %NUL terminator):
options.c: In function ‘load_mod_options’:
options.c:688:5: warning: ‘strncpy’ specified bound 256 equals destination size [-Wstringop-truncation]
688 | strncpy(mod_data_path, located_folder_name, sizeof(mod_data_path));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In order to make it easier to build SDLPoP for a distribution, extract common CFLAGS, add -D_GNU_SOURCE globally, and split out CPPFLAGS from CFLAGS. This split isn't perfect, though, since pkg-config doesn't separate CPPFLAGS from CFLAGS, but it's good enough to get dpkg-buildflags exports recognized for the build: $ dpkg-buildflags --export=sh export CFLAGS="-g -O2 -fdebug-prefix-map=/home/kees/src/SDLPoP=. -fstack-protector-strong -Wformat -Werror=format-security" export CPPFLAGS="-Wdate-time -D_FORTIFY_SOURCE=2" ...
Check for short fread() (and silence warnings under -Wunused-result
and -D_FORTIFY_SOURCE=2).
menu.c: In function ‘calculate_exe_crc’:
menu.c:2050:5: warning: ignoring return value of ‘fread’, declared with attribute warn_unused_result [-Wunused-result]
2050 | fread(buffer, 1, (size_t)size, exe_file);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Check for short fread() and fscanf() (and silence warnings under
-Wunused-result and -D_FORTIFY_SOURCE=2).
options.c: In function ‘ini_load’:
options.c:69:3: warning: ignoring return value of ‘fscanf’, declared with attribute warn_unused_result [-Wunused-result]
69 | fscanf(f, " ;%*[^\n]");
| ^~~~~~~~~~~~~~~~~~~~~~
options.c:70:3: warning: ignoring return value of ‘fscanf’, declared with attribute warn_unused_result [-Wunused-result]
70 | fscanf(f, " \n");
| ^~~~~~~~~~~~~~~~
options.c: In function ‘load_dos_exe_modifications’:
options.c:524:3: warning: ignoring return value of ‘fread’, declared with attribute warn_unused_result [-Wunused-result]
524 | fread(exe_memory, (size_t) info.st_size, 1, fp);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Instead of open-coded image numbers, positions, etc, in the code, move all the values into a common data structure, and use an enum to identify what needs drawing.
Replace README.md by a symbolic link to doc/readme.txt
Support for SDL_GameControllerRumble() and SDL_JoystickRumble()
So they appear correctly as MarkDown (see NagyD#171).
Handle more error conditions and eliminate build warnings
updated makefile to be able to build with latest amigaos4 libFLAC (1.4.2 - 08 Mar 2023)
Updated to 1.23 version files (no amiga code involved)
Updated to 1.23 version files (amigaos changes involved)
|
Ooops forget it just found I did pull to wrong branch :-( |
|
This gave me loads of merge conflicts. In the long term it would be better if I could merge |
NagyD
added a commit
that referenced
this pull request
Apr 15, 2023
NagyD
added a commit
that referenced
this pull request
Apr 15, 2023
Merge AmigaOS-specific changes into master, so the same source can be used for all systems. (#300)
|
Okay, I have merged |
NagyD
added a commit
that referenced
this pull request
Apr 15, 2023
|
1st sorry for answering so late. Downloaded and build/mAKE amigaos4 works, but I have to add some defines in makefile.amigaos4, will send it ASAP. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
updated amigaos4 SDLPoP with latest main v1.23 changes.