mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-11-11 15:21:48 +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
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
diff --git a/build/make/configure.sh b/build/make/configure.sh
|
|
index c99a01c..0ddbc3f 100755
|
|
--- a/build/make/configure.sh
|
|
+++ b/build/make/configure.sh
|
|
@@ -641,9 +641,14 @@ process_common_toolchain() {
|
|
tgt_isa=x86_64
|
|
tgt_os=darwin12
|
|
;;
|
|
- *mingw32*|*cygwin*)
|
|
+ *mingw32*|*cygwin*|*win32-gcc*)
|
|
[ -z "$tgt_isa" ] && tgt_isa=x86
|
|
tgt_os=win32
|
|
+ [ "$tgt_isa" == "x86_64" ] && tgt_os=win64
|
|
+ ;;
|
|
+ *win64-gcc*)
|
|
+ [ -z "$tgt_isa" ] && tgt_isa=x86_64
|
|
+ tgt_os=win64
|
|
;;
|
|
*linux*|*bsd*)
|
|
tgt_os=linux
|
|
diff --git a/configure b/configure
|
|
index b3c5fe9..85ef8cf 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -127,6 +127,7 @@ all_platforms="${all_platforms} x86_64-darwin12-gcc"
|
|
all_platforms="${all_platforms} x86_64-linux-gcc"
|
|
all_platforms="${all_platforms} x86_64-linux-icc"
|
|
all_platforms="${all_platforms} x86_64-solaris-gcc"
|
|
+all_platforms="${all_platforms} x86_64-win32-gcc"
|
|
all_platforms="${all_platforms} x86_64-win64-gcc"
|
|
all_platforms="${all_platforms} x86_64-win64-vs8"
|
|
all_platforms="${all_platforms} x86_64-win64-vs9"
|