Merge both osapi files into one file.

git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10163 387891d4-d844-0410-90c0-e4c51a9137d3
Also delete the old unix-osapi file, it isn't needed anymore.

git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10167 387891d4-d844-0410-90c0-e4c51a9137d3
Fix a problem with the mouse where the controls were stuck.

git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10172 387891d4-d844-0410-90c0-e4c51a9137d3
Closer to working compile with Xcode 5.

git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10173 387891d4-d844-0410-90c0-e4c51a9137d3
Sync to trunk revision 10223

git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10227 387891d4-d844-0410-90c0-e4c51a9137d3
sync to trunk 10223

git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10228 387891d4-d844-0410-90c0-e4c51a9137d3
Change std::map SDL2FS2 to SCP_map

git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10229 387891d4-d844-0410-90c0-e4c51a9137d3
Removes the CRITICAL_SECTION macros, as these were just obscuring calls to SDL functions

git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10230 387891d4-d844-0410-90c0-e4c51a9137d3
Replace call to vwglSwapIntervalEXT with SDL_GL_SetSwapInterval

git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10231 387891d4-d844-0410-90c0-e4c51a9137d3
Correctly initialize haptic support.

git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10234 387891d4-d844-0410-90c0-e4c51a9137d3
The fuck is wrong with you, svn, I told you to sync

git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10248 387891d4-d844-0410-90c0-e4c51a9137d3
From m!m: Proper use of SDL2Main

git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10258 387891d4-d844-0410-90c0-e4c51a9137d3
Trunk sync r10257

git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10259 387891d4-d844-0410-90c0-e4c51a9137d3
Fix for some crashes, by Flaming_Sword

git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10276 387891d4-d844-0410-90c0-e4c51a9137d3
Trunk Sync: r10464 This is sans Trunk Commit 10463 due to osapi changes.

git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10465 387891d4-d844-0410-90c0-e4c51a9137d3
Merge changes of trunk r10463.

git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10468 387891d4-d844-0410-90c0-e4c51a9137d3
Trunk Sync r10476

git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10478 387891d4-d844-0410-90c0-e4c51a9137d3
Adds SDL2main.lib to linking for SSE2 Debug/Release builds.

git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10479 387891d4-d844-0410-90c0-e4c51a9137d3