q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-22 10:20:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
55 Commits 2 Branches 0 Tags 94 MiB
cdcf6afc34
Commit Graph

55 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Salamanderrake
cdcf6afc34 Sources/CMakeLists.txt: Added missing find_packge(SDL REQUIRED) to link in the SDL1.2 libraries via ${SDL_LIBRARY} generate variable 
and added to the target_link_libraries for SeriousSam and SeriousSamDedicated. I don't know not linking the SDL library was

	the intended outcome but SeriousSam* was failing to link to libSeriousEngine.a.
 2016-04-02 22:33:11 -04:00
Ryan C. Gordon
a96fe8de8b Patched to compile on Linux. 
(The EntitiesMP and/or GameMP libraries need symbols exported from the main
binary, but when we built the engine as a static library to reuse it between
the client and server, the Linux linker stripped out symbols those libraries
needed. If we can force these symbols to remain, or maybe move to shared
library..? then we can avoid building the engine sources twice to get the
dedicated server too. For now, though...good enough!)
 2016-04-02 21:55:48 -04:00
Ryan C. Gordon
74a7321a7f Don't do the Mac policy for now, it upsets pre-3.0 CMake. 
I don't want to bump requirements to CMake 3 yet.
 2016-04-02 21:54:38 -04:00
Ryan C. Gordon
9c5fa5f0fc Fixed some things GCC complained about on this Linux box. 2016-04-02 02:03:41 -04:00
Salamanderrake
2be26952c7 Case Issue with #include statement. 
* Gfx_wrapper.cpp: two #include statemenst with incorrect case.

* Fixed an empty line issue
 2016-04-02 01:12:25 -04:00
Salamanderrake
4ce00bca08 Statistics_internal.h: Incorrect case as its Statistics_Internal.h on disk. 2016-04-02 01:11:53 -04:00
Salamanderrake
7778fdcaae Add missing ; to Sources/Ecc/Parser.y 2016-04-01 23:38:29 -04:00
Ryan C. Gordon
49b5163cc9 Regenerated parsers and scanners. 2016-04-01 15:17:48 -04:00
Ryan C. Gordon
d02a7a41c4 Added CMake and a simple Mac build script, and nuked the awful old Makefile. 2016-04-01 15:17:23 -04:00
Ryan C. Gordon
0d426d5998 Fixed up some StdH includes. 2016-04-01 14:04:24 -04:00
Ryan C. Gordon
3e59daa5e6 Fixed function signature for yyerror to take a const char *. 2016-04-01 12:19:18 -04:00
Ryan C. Gordon
5aea1f7c4d Untangle the symbols in the engine's parser and the Ska parser. 2016-04-01 01:49:13 -04:00
Ryan C. Gordon
b29b27a868 Turn this back off. 2016-04-01 01:49:13 -04:00
Ryan C. Gordon
0f6b9ca1c1 We actually get NULL here, so these stay for now, Clang warnings be damned. 2016-03-31 21:54:25 -04:00
Ryan C. Gordon
88c41117f5 Fill in some stuff that is needed to compile. 
I had better versions of this stuff, which I still need to re-merge.
 2016-03-31 21:53:54 -04:00
Ryan C. Gordon
f1e8add4ca "-mdynamic-no-pic" was largely a Mac OS X/powerpc optimization. Remove it. 2016-03-31 16:01:23 -04:00
Ryan C. Gordon
887bc474e0 Deal with other things that are optimizing out instead of linking properly. 2016-03-31 15:48:48 -04:00
Ryan C. Gordon
7c9d29ad1a Naturally, there are two files with inline asm with an "mmShift" symbol. :) 2016-03-31 15:48:48 -04:00
Ryan C. Gordon
ee754e7edf Made static variables that inline asm needs to touch non-static. 
I dislike having to do this, but Clang sees them as unused and removes them
from the object file, causing linking to fail.

The real solution here is to remove all the assembly code because it's 2016
and this game doesn't have to run on 133MHz Pentium now.  :)
 2016-03-31 13:04:57 -04:00
Ryan C. Gordon
ed527eb29e A little tapdancing to fix a missing symbol at link time. 2016-03-31 12:40:11 -04:00
Ryan C. Gordon
2668cdc44f Fix up some mismerges and get the OpenGL code to compile again. 2016-03-31 12:26:43 -04:00
Ryan C. Gordon
c2be372822 Some work to get Stream.cpp compiling. 2016-03-31 12:25:53 -04:00
Ryan C. Gordon
fbfef87ce0 Fixed a mismerge. 2016-03-31 12:25:40 -04:00
Ryan C. Gordon
75b824ddf8 Removed the exception handling code from CTStream. 
I think this is a leftover from the mmap()-like code that used to be
in the engine, but now it's a lot of complexity to basically test this:

- Was this a memory access violation?
- If no, crash.
- If yes:
  - Was it part of a CTStream?
  - If no, crash.
  - If yes, crash.

Instead, let's just crash.   :)

(If I'm misunderstanding this, just roll back from revision control.)
 2016-03-31 12:22:55 -04:00
Ryan C. Gordon
105bc12d64 Bunch more work on getting this to compile. Down to Stream and Gfx_OpenGL now. 2016-03-30 13:41:30 -04:00
Ryan C. Gordon
7d118bd249 First attempt at porting GameAgent code. 2016-03-30 11:00:29 -04:00
Ryan C. Gordon
8ea00b12d2 More work on getting this to compile. 2016-03-30 11:00:01 -04:00
Ryan C. Gordon
4f061d916c Adding regenerated parsers so they'll stop spamming my diffs. 2016-03-30 10:59:17 -04:00
Ryan C. Gordon
888b35dbca Mismerge fix. 2016-03-30 10:56:56 -04:00
Ryan C. Gordon
146da64d86 Fixed filename case on an include statement. 2016-03-30 04:00:23 -04:00
Ryan C. Gordon
98972f6a43 Build everything with -fPIC until we dump this Makefile for CMake. 2016-03-30 03:58:31 -04:00
Ryan C. Gordon
2e7af8cf00 More mismerge corrections and other fixes to get this closer to compiling. 2016-03-30 02:01:02 -04:00
Ryan C. Gordon
28a8b5cb2e Various patches to get this closer to compiling again. 2016-03-30 01:51:52 -04:00
Ryan C. Gordon
6ac856824f Fixed mismerge. 2016-03-30 01:36:03 -04:00
Ryan C. Gordon
aa8d0216db fixed a variable initialized and also marked 'extern'. 2016-03-30 01:31:46 -04:00
Ryan C. Gordon
9bdb8becb1 Whoops, that '==' should be '='. 2016-03-30 01:31:24 -04:00
Ryan C. Gordon
735b1cb66b Fixed mismerge. 2016-03-30 01:29:43 -04:00
Ryan C. Gordon
892fbea6cd Turned off some compiler warnings for now. 
Just need to see through the mess until this compiles again.
 2016-03-30 01:28:12 -04:00
Ryan C. Gordon
43e4866df4 Fixed a mismerge. 2016-03-30 01:27:59 -04:00
Ryan C. Gordon
18b339a2b6 Uncommented to include Terrain.h. Let's see what happens. 2016-03-30 01:25:58 -04:00
Ryan C. Gordon
2f10f864d8 Silence a whole bunch of warnings about string literals vs non-const char *. 2016-03-29 12:51:34 -04:00
Ryan C. Gordon
a4000c69a8 Clean out a bunch of compiler warnings. 2016-03-29 12:51:33 -04:00
Ryan C. Gordon
bafa5fca05 Blank .es files confuse ECC, so remove them. 2016-03-28 23:51:18 -04:00
Ryan C. Gordon
e564f155e5 Updated Makefile to (maybe) build this on a modern Mac. 2016-03-28 23:51:18 -04:00
Ryan C. Gordon
24cb244d43 First attempt to hand-merge Ryan's Linux and Mac OS X port. 
This was a _ton_ of changes, made 15 years ago, so there are probably some
problems to work out still.

Among others: Engine/Base/Stream.* was mostly abandoned and will need to be
re-ported.

Still, this is a pretty good start, and probably holds a world record for
lines of changes or something.  :)
 2016-03-28 23:46:13 -04:00
SLAwww
a7af6eb20b Removing generated files 2016-03-11 16:47:14 +02:00
SLAwww
89c9fc2bf9 Update GameAgent.txt 2016-03-11 16:12:57 +02:00
SLAwww
8068ab1fa2 Uploading missing files and folders 2016-03-11 16:09:10 +02:00
SLAwww
111de045d0 Delete Empty 2016-03-11 16:06:45 +02:00
SLAwww
ca3048de3b Create Empty 2016-03-11 16:06:22 +02:00