Commit graph

8064 commits

Author SHA1 Message Date
hendricks266
03afe5c1ea Xcode: Add GameController.framework, needed by SDL2, when building for iOS.
git-svn-id: https://svn.eduke32.com/eduke32@5564 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-12 10:31:40 +00:00
hendricks266
0874812e34 Xcode: Don't link libs to libs.
git-svn-id: https://svn.eduke32.com/eduke32@5563 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-12 10:31:36 +00:00
hendricks266
a4b4171f71 Xcode: Bump OS X deployment target to 10.10, because I run that on my machine and Homebrew's libs target it. Also set the iOS deployment target to 6.0, the minimum Xcode will allow me.
git-svn-id: https://svn.eduke32.com/eduke32@5562 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-12 10:31:33 +00:00
hendricks266
88dbd6113a Xcode: Update file listings.
git-svn-id: https://svn.eduke32.com/eduke32@5561 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-12 10:31:30 +00:00
hendricks266
bc1ea6171f Xcode: Clean up how some file paths are defined.
git-svn-id: https://svn.eduke32.com/eduke32@5560 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-12 10:31:27 +00:00
hendricks266
334d5c1ef6 Xcode: Automatically suggested changes.
git-svn-id: https://svn.eduke32.com/eduke32@5559 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-12 10:31:24 +00:00
hendricks266
2beee7056c iOS: Eliminate some minor warnings.
git-svn-id: https://svn.eduke32.com/eduke32@5558 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-12 10:31:19 +00:00
hendricks266
95a70e063d OS X: Fix Polymer build.
git-svn-id: https://svn.eduke32.com/eduke32@5557 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-12 10:31:15 +00:00
hendricks266
a35f3b13dc Replace the semicolon trailing empty-bodied loops with opening and closing braces.
I believe this is the clearest way to indicate that an empty-bodied loop is intended, as opposed to the possibility of a mistaken semicolon.

This eliminates "warning: suggest a space before β€˜;’ or explicit braces around empty body in β€˜for’ statement" with GCC 4.2, which is important for old OS X versions.

git-svn-id: https://svn.eduke32.com/eduke32@5556 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-12 10:31:12 +00:00
hendricks266
c695e8e911 Makefile: Improve how we enable and disable warnings. This fixes incompatibilities between r5543 and certain platforms.
git-svn-id: https://svn.eduke32.com/eduke32@5555 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-12 10:31:07 +00:00
hendricks266
4c7a460d6a Add some UNREFERENCED_PARAMETER for when Vorbis or FLAC are disabled.
git-svn-id: https://svn.eduke32.com/eduke32@5554 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-12 10:31:05 +00:00
hendricks266
c1f67576a4 CON: Add userdef[].soundtoggle. Read-only.
git-svn-id: https://svn.eduke32.com/eduke32@5553 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-12 10:31:01 +00:00
hendricks266
344e10628f Part two of more const casting, this time affecting argv instances.
git-svn-id: https://svn.eduke32.com/eduke32@5552 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-12 10:30:56 +00:00
hendricks266
98ebda94ec Address some const-disregarding casts missed in r5540 due to conditional compilation settings and platforms.
git-svn-id: https://svn.eduke32.com/eduke32@5551 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-12 10:30:48 +00:00
hendricks266
da1081112c Winlayer: Bound code with USE_GLEXT where missed in r5526.
Also make some dead GL debugging code not dead during debug builds.

git-svn-id: https://svn.eduke32.com/eduke32@5550 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-12 10:30:40 +00:00
hendricks266
c52b90a0a2 synthesis.sh: Make use of the EDUKE32_REVISION file when packaging tarballs.
git-svn-id: https://svn.eduke32.com/eduke32@5549 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-12 10:30:36 +00:00
terminx
3126cec75e I'm either clever, or an idiot. Or both.
git-svn-id: https://svn.eduke32.com/eduke32@5548 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-11 05:06:14 +00:00
terminx
db8b4a00b6 Enable -Wwrite-strings and fix all instances where string constants were passed to functions accepting a char ptr.
git-svn-id: https://svn.eduke32.com/eduke32@5547 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-11 05:06:10 +00:00
terminx
e27eb7a7e5 Use XXH64 functions for editor undo/redo when building for 64-bit.
git-svn-id: https://svn.eduke32.com/eduke32@5546 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-11 05:06:02 +00:00
terminx
ea1f6dc476 Fix some ENet const issues. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@5545 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-11 05:05:59 +00:00
terminx
cf5ff0fcdc Update ENet to v1.3.13. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@5544 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-11 05:05:54 +00:00
terminx
e0d8a753a1 Add -Wuninitialized, -Wlogical-op, and -Wcast-qual. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@5543 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-11 05:05:50 +00:00
terminx
df32b0b788 Update to the newest version of xxHash.
git-svn-id: https://svn.eduke32.com/eduke32@5542 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-11 05:05:47 +00:00
terminx
3d72611f57 Update vcxproj. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@5541 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-11 05:05:43 +00:00
terminx
a7e6ed8745 Fix quite a few issues with casting away const and volatile qualifiers, found with -Wcast-qual. If we're going to use const everywhere, we should really mean it!
git-svn-id: https://svn.eduke32.com/eduke32@5540 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-11 05:05:38 +00:00
terminx
8fc803fee3 Negligible change to OS string printed at startup.
git-svn-id: https://svn.eduke32.com/eduke32@5539 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-11 05:05:25 +00:00
terminx
b1103bb342 Fix a stupid error in MACT, found with GCC's -Wlogical-op parameter.
git-svn-id: https://svn.eduke32.com/eduke32@5538 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-11 05:05:21 +00:00
terminx
603ae7eb7a CON compilation and debug message fuckery affecting virtually nobody
git-svn-id: https://svn.eduke32.com/eduke32@5537 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-11 05:05:18 +00:00
terminx
88e08319b9 Clean up some of the SDL version number spam at startup.
git-svn-id: https://svn.eduke32.com/eduke32@5536 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-11 05:05:16 +00:00
terminx
15b57d4dcf Fix a few instances where bitptr wasn't properly set after writing to the compiled script
git-svn-id: https://svn.eduke32.com/eduke32@5535 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-11 05:05:13 +00:00
terminx
31e89f12b2 Clean up a couple instances of direct usage of a magic number in the CON compiler. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@5534 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-11 05:05:10 +00:00
terminx
e1124f9d12 Make the bitptr stuff in the CON compiler more readable.
git-svn-id: https://svn.eduke32.com/eduke32@5533 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-11 05:05:05 +00:00
hendricks266
2e968b90bf Add inthashtable_t, mapping intptr_t to intptr_t.
git-svn-id: https://svn.eduke32.com/eduke32@5532 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-08 01:33:46 +00:00
hendricks266
d4dc72bac4 C-CON: Add getpv and setpv as short forms for get/setplayervar, and #include as an alternate for include.
git-svn-id: https://svn.eduke32.com/eduke32@5531 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-08 01:33:43 +00:00
hendricks266
f403d6234c C-CON: Add ifvarge, ifvarle, and ifvarboth in line with ifvarvarge, ifvarvarle, and ifvarvarboth.
git-svn-id: https://svn.eduke32.com/eduke32@5530 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-08 01:33:39 +00:00
hendricks266
3a8d53573c Remove actors_inline, game_inline, and sector_inline objects, and move their code into other headers, set up to be compiled into well-fitting objects if inlining them is disabled.
git-svn-id: https://svn.eduke32.com/eduke32@5529 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-08 01:33:35 +00:00
hendricks266
28a9372a79 Enable models by default under EDUKE32_GLES, because they now work!
git-svn-id: https://svn.eduke32.com/eduke32@5528 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-08 01:33:28 +00:00
hendricks266
8e52d7b1f7 Fix miscellaneous GL ES warnings
git-svn-id: https://svn.eduke32.com/eduke32@5527 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-08 01:33:25 +00:00
hendricks266
e00115c043 Introduce USE_GLEXT macro and use it to conditionally compile out all GL ARB function calls when compiling for GL ES platforms.
This replaces the previous hack where we kept the dynamic pointers null and simply never tried calling any of them by a conspiracy of default runtime settings and disabled menu options.

Code affected: VBO support for models, VPX GLSL decoding, texture compression (texture cache), and multitexturing (glow/detail maps).

This commit also replaces EDUKE32_GLES conditionals with USE_GLEXT where appropriate.

I didn't touch polymer.c because it depends too heavily on extensions for conditionally compiling them to make sense.

git-svn-id: https://svn.eduke32.com/eduke32@5526 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-08 01:33:20 +00:00
hendricks266
ff80e020ad jwzgles: fix warnings when compiling on Linux
git-svn-id: https://svn.eduke32.com/eduke32@5525 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-08 01:33:15 +00:00
hendricks266
8d73dca2d2 jwzgles: uncomment stub glPush/PopAttrib so that the editor links
git-svn-id: https://svn.eduke32.com/eduke32@5524 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-08 01:33:11 +00:00
hendricks266
409b14fb62 jwzgles: fix errors when compiling on Linux
git-svn-id: https://svn.eduke32.com/eduke32@5523 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-08 01:33:08 +00:00
hendricks266
8cd708cef4 C-CON: Fix the return command within events, broken since r5097.
git-svn-id: https://svn.eduke32.com/eduke32@5522 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-08 01:33:05 +00:00
hendricks266
5d9b8a2bb1 C-CON: Clean up pointer handling in the parser so we have less to re-offset in C_SetScriptSize. Also fixes bugs in r5093 and/or r5097.
git-svn-id: https://svn.eduke32.com/eduke32@5521 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-08 01:33:01 +00:00
hendricks266
1807aec2a7 C-CON: Fix VM_ScriptInfo so that it never reads before the beginning of the bytecode.
git-svn-id: https://svn.eduke32.com/eduke32@5520 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-08 01:32:57 +00:00
hendricks266
d3f9244d66 Remove -CONversion command line parameter, because it has been supplanted by r5499's automatic identifier masking.
git-svn-id: https://svn.eduke32.com/eduke32@5519 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-08 01:32:53 +00:00
hendricks266
aafb01ab33 Move loading of settings.cfg to before video init so that it can respect r_togglecomposition.
git-svn-id: https://svn.eduke32.com/eduke32@5518 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-08 01:32:50 +00:00
hendricks266
c2b5ae8256 Menus: Move "Cheats" from Options to Game Setup.
git-svn-id: https://svn.eduke32.com/eduke32@5517 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-08 01:32:47 +00:00
hendricks266
d5b22a714f Fix POLYMER=0 warnings introduced in r5496.
git-svn-id: https://svn.eduke32.com/eduke32@5516 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-08 01:32:44 +00:00
hendricks266
855e9117ff Fix USE_OPENGL=0 compiler errors introduced in r5475.
git-svn-id: https://svn.eduke32.com/eduke32@5515 1a8010ca-5511-0410-912e-c29ae57300e0
2016-01-08 01:32:41 +00:00