mirror of
https://github.com/DrBeef/Raze.git
synced 2024-12-12 05:32:29 +00:00
dac94ce284
This includes a complete Windows header and library refresh, including the addition of 64-bit compiled libs: *libogg 1.3.0 *libvorbis 1.3.3 *zlib 1.2.7 *libpng 1.5.13 *libvpx 9a3de881c0e681ba1a79a166a86308bbc84b4acd *SDL_mixer 1.2.12 (for RENDERTYPE=SDL) *DirectX import libraries: dsound and dxguid (now included) To build in 64-bit, you essentially need MinGW's MSYS (but not MinGW itself) and MinGW-w64 at the top of your PATH. The target is automatically detected using `$(CC) -dumpmachine`. The EDukeWiki will get detailed instrucitons. All compiler and linker warnings when building in 64-bit mode have been fixed. Remaining 64-bit to-do: - The ebacktrace dll does not build under 64-bit. It uses code specific to the format of 32-bit executables and will have to be ported to work with 64-bit executables. A future 64-bit version will be named ebacktrace1-64.dll. - RENDERTYPE=SDL crashes in SDL_mixer's Mix_Linked_Version(). - DirectInput gives an error and does not function. This only affects joysticks, and the error never happens without any plugged in. - Port the classic renderer ASM to 64-bit. (Just kidding, this is way out of my league.) This commit includes a fair bit of Makefile development spanning all platforms, including simplifying the SDLCONFIG code, fixing build on Mac OS X (thanks rhoenie!), globally factoring Apple brew/port inclusion, enforcing that all -L come before all -l, and ensuring that $(shell ) is always :='d. In addition, I have resurrected the old GCC_MAJOR and GCC_MINOR detection using `$(CC) -dumpversion`, but I have made it failsafe in case the command fails or the version is manually specified. I have applied this new fine-grained detection where applicable, including allowing LTO, and restraining -W's to versions that support them. git-svn-id: https://svn.eduke32.com/eduke32@3278 1a8010ca-5511-0410-912e-c29ae57300e0
49 lines
921 B
C
49 lines
921 B
C
// SDL interface layer
|
|
// for the Build Engine
|
|
// by Jonathon Fowler (jf@jonof.id.au)
|
|
|
|
#ifndef __build_interface_layer__
|
|
#define __build_interface_layer__ SDL
|
|
|
|
#include "sdl_inc.h"
|
|
#include "compat.h"
|
|
#include "baselayer.h"
|
|
|
|
#ifdef _WIN32
|
|
HINSTANCE win_gethinstance(void);
|
|
#endif
|
|
|
|
struct sdlappicon {
|
|
int32_t width,height;
|
|
uint8_t *pixels;
|
|
};
|
|
|
|
#if (SDL_MAJOR_VERSION == 1 && SDL_MINOR_VERSION < 3) // SDL 1.2
|
|
int32_t SDL_WaitEventTimeout(SDL_Event *event, int32_t timeout);
|
|
#endif
|
|
|
|
static inline void idle_waitevent_timeout(uint32_t timeout)
|
|
{
|
|
SDL_WaitEventTimeout(NULL, timeout);
|
|
}
|
|
|
|
static inline void idle_waitevent(void)
|
|
{
|
|
SDL_WaitEvent(NULL);
|
|
}
|
|
|
|
static inline void idle(void)
|
|
{
|
|
#ifndef _WIN32
|
|
usleep(1000);
|
|
#else
|
|
Sleep(1);
|
|
#endif
|
|
}
|
|
|
|
#else
|
|
#if (__build_interface_layer__ != SDL)
|
|
#error "Already using the " __build_interface_layer__ ". Can't now use SDL."
|
|
#endif
|
|
#endif // __build_interface_layer__
|
|
|