#3 General project maintenance & Windows build fix

已关闭
KillianPalmer 请求将 0 次代码提交从 KillianPalmer/master 合并至 38_ViTa_38/master

I hope the commits are fairly self-explanatory. Here I'll just explain some of the reasoning behind the changes:

  • [1273ef4] PrBoom+ compile warnings are now disabled, as these aren't really relevant to XDRE and just clutter the compilation output.
  • [8e56a55] There must exist a better fix for this issue, but this is what happens to work for me: I was getting make errors due to the rdatawad executable ("No rule to make target 'rdatawad' [...] Stop."). This was fixed by manually appending the 'exe' file extension in the relevant Makefile.am script. Now, Autotools will generate prboom-plus.wad by running rdatawad.exe as a Windows executable through Wine.
    I suspect that the correct solution would be to somehow tell Autotools to build rdatawad as a Linux executable, and then run it natively to generate prboom-plus.wad, thus not requiring Wine.
  • [d26e9bb] On my system, the general '-static' linker flag wasn't enough to statically link SDL2. The build would always end in linker errors. This was because sdl2.m4 was missing the ability to request static linker flags, which I then added myself. This flag now used in the Windows build scripts.
  • [362866a5ea] The reason the XDRE 2.21 release "didn't work" on Windows was only because of the absence of the prboom-plus.wad file. The program actually runs perfectly fine, but exits early when it can't find this file. The program even prints a warning message to the user to stdout, but because Windows GUI programs don't print stdout to the command-line like on Linux, it just looks like the program won't load.
I hope the commits are fairly self-explanatory. Here I'll just explain some of the reasoning behind the changes: * [1273ef4] PrBoom+ compile warnings are now disabled, as these aren't really relevant to XDRE and just clutter the compilation output. * [8e56a55] There must exist a better fix for this issue, but this is what happens to work for me: I was getting make errors due to the rdatawad executable ("No rule to make target 'rdatawad' [...] Stop."). This was fixed by manually appending the 'exe' file extension in the relevant Makefile.am script. Now, Autotools will generate prboom-plus.wad by running rdatawad.exe as a Windows executable through Wine. I suspect that the correct solution would be to somehow tell Autotools to build rdatawad as a Linux executable, and then run it natively to generate prboom-plus.wad, thus not requiring Wine. * [d26e9bb] On my system, the general '-static' linker flag wasn't enough to statically link SDL2. The build would always end in linker errors. This was because sdl2.m4 was missing the ability to request static linker flags, which I then added myself. This flag now used in the Windows build scripts. * [362866a5ea] The reason the XDRE 2.21 release "didn't work" on Windows was only because of the absence of the prboom-plus.wad file. The program actually runs perfectly fine, but exits early when it can't find this file. The program even prints a warning message to the user to stdout, but because Windows GUI programs don't print stdout to the command-line like on Linux, it just looks like the program won't load.
KillianPalmer 评论于 4 年之前
发布者

Closing in favor of earlier pull request #2. Both pull request are now the same.

Closing in favor of earlier pull request #2. Both pull request are now the same.
请重新开启合并请求来完成合并操作。
登录 并参与到对话中。
未选择标签
未选择里程碑
未指派成员
1 名参与者
正在加载...
取消
保存
这个人很懒,什么都没留下。