zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove HAVE_INTTYPES define.

Browse source 
No #else was ever provided for any build system that lacks inttypes besides MSVC.

git-svn-id: https://svn.eduke32.com/eduke32@6073 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-02-25 08:15:20 +00:00
parent 2b8fb9bfc1
commit 22fbca52ca
5 changed files with 7 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Android.mk
View file

@ -14,7 +14,7 @@ COMMONFLAGS := -x c++ -std=gnu++11 -fvisibility=hidden -fPIC -funsigned-char
-W -Wall -Wextra -Wpointer-arith -Wno-char-subscripts -Wno-missing-braces -Wwrite-strings -Wuninitialized \ -W -Wall -Wextra -Wpointer-arith -Wno-char-subscripts -Wno-missing-braces -Wwrite-strings -Wuninitialized \
-Wno-attributes -Wno-strict-overflow -Wno-unused-result -Wlogical-op -Wcast-qual -Werror=return-type \ -Wno-attributes -Wno-strict-overflow -Wno-unused-result -Wlogical-op -Wcast-qual -Werror=return-type \
-DHAVE_VORBIS -DHAVE_JWZGLES -DHAVE_ANDROID -DRENDERTYPESDL=1 -DMIXERTYPESDL=1 -DUSE_OPENGL -DNETCODE_DISABLE -DUSE_LIBVPX \ -DHAVE_VORBIS -DHAVE_JWZGLES -DHAVE_ANDROID -DRENDERTYPESDL=1 -DMIXERTYPESDL=1 -DUSE_OPENGL -DNETCODE_DISABLE -DUSE_LIBVPX \
-DHAVE_INTTYPES -D_GNU_SOURCE=1 -D_REENTRANT -D_GNU_SOURCE=1 -D_REENTRANT
ifeq ($(FOUND_CLANG),1) ifeq ($(FOUND_CLANG),1)
COMMONFLAGS += -Wno-unknown-warning-option -Wno-deprecated-register COMMONFLAGS += -Wno-unknown-warning-option -Wno-deprecated-register

8
Common.mak
View file

@ -699,7 +699,6 @@ endif
# endif # endif
ifeq ($(SUBPLATFORM),LINUX) ifeq ($(SUBPLATFORM),LINUX)
COMPILERFLAGS+= -DHAVE_INTTYPES
GTKCOMPAT32=0 GTKCOMPAT32=0
ifeq ($(PLATFORM),GCW) ifeq ($(PLATFORM),GCW)
@ -749,7 +748,6 @@ ifeq ($(PLATFORM),DARWIN)
COMPILERFLAGS+= -I/sw/include COMPILERFLAGS+= -I/sw/include
endif endif
COMPILERFLAGS += -DHAVE_INTTYPES
DLLSUFFIX=.dylib DLLSUFFIX=.dylib
GTKCOMPAT32 = 0 GTKCOMPAT32 = 0
WITHOUT_GTK ?= 1 WITHOUT_GTK ?= 1
@ -763,7 +761,7 @@ ifeq ($(PLATFORM),DARWIN)
endif endif
endif endif
ifeq ($(PLATFORM),WINDOWS) ifeq ($(PLATFORM),WINDOWS)
COMPILERFLAGS+= -DUNDERSCORES -DHAVE_INTTYPES -Iplatform/Windows/include COMPILERFLAGS+= -DUNDERSCORES -Iplatform/Windows/include
LINKERFLAGS+= -static-libgcc LINKERFLAGS+= -static-libgcc
ifeq (0,$(CLANG)) ifeq (0,$(CLANG))
L_CXXONLYFLAGS += -static-libstdc++ L_CXXONLYFLAGS += -static-libstdc++
@ -795,8 +793,6 @@ else
endif endif
ifeq ($(PLATFORM),BSD) ifeq ($(PLATFORM),BSD)
COMPILERFLAGS+= -I/usr/local/include COMPILERFLAGS+= -I/usr/local/include
COMPILERFLAGS+= -DHAVE_INTTYPES
endif endif
ifeq ($(PLATFORM),BEOS) ifeq ($(PLATFORM),BEOS)
override NOASM=1 override NOASM=1
@ -816,7 +812,7 @@ ifeq ($(PLATFORM),WII)
override WITHOUT_GTK=1 override WITHOUT_GTK=1
# -msdata=eabi # -msdata=eabi
COMMONFLAGS+= -g -mtune=750 -meabi -mhard-float COMMONFLAGS+= -g -mtune=750 -meabi -mhard-float
COMPILERFLAGS+= -DGEKKO -DHAVE_INTTYPES -D__POWERPC__ -I$(LIBOGC_INC) -I$(PORTLIBS)/include -Iplatform/Wii/include COMPILERFLAGS+= -DGEKKO -D__POWERPC__ -I$(LIBOGC_INC) -I$(PORTLIBS)/include -Iplatform/Wii/include
SDLCONFIG= SDLCONFIG=
SDL_TARGET=1 SDL_TARGET=1
LIBDIRS += -L$(LIBOGC_LIB) -L$(PORTLIBS)/lib -Lplatform/Wii/lib LIBDIRS += -L$(LIBOGC_LIB) -L$(PORTLIBS)/lib -Lplatform/Wii/lib

20
platform/Apple/EDuke32.xcodeproj/project.pbxproj
View file

@ -2415,7 +2415,6 @@
"-D_FORTIFY_SOURCE=2", "-D_FORTIFY_SOURCE=2",
"-DUSE_LIBPNG", "-DUSE_LIBPNG",
"-DUSE_LIBVPX", "-DUSE_LIBVPX",
"-DHAVE_INTTYPES",
"-DSDL_TARGET=2", "-DSDL_TARGET=2",
"-DRENDERTYPESDL=1", "-DRENDERTYPESDL=1",
"-DMIXERTYPESDL=1", "-DMIXERTYPESDL=1",
@ -2529,7 +2528,6 @@
"-D_FORTIFY_SOURCE=2", "-D_FORTIFY_SOURCE=2",
"-DUSE_LIBPNG", "-DUSE_LIBPNG",
"-DUSE_LIBVPX", "-DUSE_LIBVPX",
"-DHAVE_INTTYPES",
"-DSDL_TARGET=2", "-DSDL_TARGET=2",
"-DRENDERTYPESDL=1", "-DRENDERTYPESDL=1",
"-DMIXERTYPESDL=1", "-DMIXERTYPESDL=1",
@ -2649,7 +2647,6 @@
"-D_FORTIFY_SOURCE=2", "-D_FORTIFY_SOURCE=2",
"-DUSE_LIBPNG", "-DUSE_LIBPNG",
"-DUSE_LIBVPX", "-DUSE_LIBVPX",
"-DHAVE_INTTYPES",
"-DSDL_TARGET=2", "-DSDL_TARGET=2",
"-DRENDERTYPESDL=1", "-DRENDERTYPESDL=1",
"-DMIXERTYPESDL=1", "-DMIXERTYPESDL=1",
@ -2763,7 +2760,6 @@
"-D_FORTIFY_SOURCE=2", "-D_FORTIFY_SOURCE=2",
"-DUSE_LIBPNG", "-DUSE_LIBPNG",
"-DUSE_LIBVPX", "-DUSE_LIBVPX",
"-DHAVE_INTTYPES",
"-DSDL_TARGET=2", "-DSDL_TARGET=2",
"-DRENDERTYPESDL=1", "-DRENDERTYPESDL=1",
"-DMIXERTYPESDL=1", "-DMIXERTYPESDL=1",
@ -2874,7 +2870,6 @@
"-D_FORTIFY_SOURCE=2", "-D_FORTIFY_SOURCE=2",
"-DUSE_LIBPNG", "-DUSE_LIBPNG",
"-DUSE_LIBVPX", "-DUSE_LIBVPX",
"-DHAVE_INTTYPES",
"-DSDL_TARGET=2", "-DSDL_TARGET=2",
"-DRENDERTYPESDL=1", "-DRENDERTYPESDL=1",
"-DMIXERTYPESDL=1", "-DMIXERTYPESDL=1",
@ -2977,7 +2972,6 @@
"-D_FORTIFY_SOURCE=2", "-D_FORTIFY_SOURCE=2",
"-DUSE_LIBPNG", "-DUSE_LIBPNG",
"-DUSE_LIBVPX", "-DUSE_LIBVPX",
"-DHAVE_INTTYPES",
"-DSDL_TARGET=2", "-DSDL_TARGET=2",
"-DRENDERTYPESDL=1", "-DRENDERTYPESDL=1",
"-DMIXERTYPESDL=1", "-DMIXERTYPESDL=1",
@ -3083,7 +3077,6 @@
"-D_FORTIFY_SOURCE=2", "-D_FORTIFY_SOURCE=2",
"-DUSE_LIBPNG", "-DUSE_LIBPNG",
"-DUSE_LIBVPX", "-DUSE_LIBVPX",
"-DHAVE_INTTYPES",
"-DSDL_TARGET=2", "-DSDL_TARGET=2",
"-DRENDERTYPESDL=1", "-DRENDERTYPESDL=1",
"-DMIXERTYPESDL=1", "-DMIXERTYPESDL=1",
@ -3183,7 +3176,6 @@
"-D_FORTIFY_SOURCE=2", "-D_FORTIFY_SOURCE=2",
"-DUSE_LIBPNG", "-DUSE_LIBPNG",
"-DUSE_LIBVPX", "-DUSE_LIBVPX",
"-DHAVE_INTTYPES",
"-DSDL_TARGET=2", "-DSDL_TARGET=2",
"-DRENDERTYPESDL=1", "-DRENDERTYPESDL=1",
"-DMIXERTYPESDL=1", "-DMIXERTYPESDL=1",
@ -3288,7 +3280,6 @@
"-D_FORTIFY_SOURCE=2", "-D_FORTIFY_SOURCE=2",
"-DUSE_LIBPNG", "-DUSE_LIBPNG",
"-DUSE_LIBVPX", "-DUSE_LIBVPX",
"-DHAVE_INTTYPES",
"-DSDL_TARGET=2", "-DSDL_TARGET=2",
"-DRENDERTYPESDL=1", "-DRENDERTYPESDL=1",
"-DMIXERTYPESDL=1", "-DMIXERTYPESDL=1",
@ -3387,7 +3378,6 @@
"-D_FORTIFY_SOURCE=2", "-D_FORTIFY_SOURCE=2",
"-DUSE_LIBPNG", "-DUSE_LIBPNG",
"-DUSE_LIBVPX", "-DUSE_LIBVPX",
"-DHAVE_INTTYPES",
"-DSDL_TARGET=2", "-DSDL_TARGET=2",
"-DRENDERTYPESDL=1", "-DRENDERTYPESDL=1",
"-DMIXERTYPESDL=1", "-DMIXERTYPESDL=1",
@ -3525,7 +3515,6 @@
"-D_FORTIFY_SOURCE=2", "-D_FORTIFY_SOURCE=2",
"-DUSE_LIBPNG", "-DUSE_LIBPNG",
"-DUSE_LIBVPX", "-DUSE_LIBVPX",
"-DHAVE_INTTYPES",
"-DSDL_TARGET=2", "-DSDL_TARGET=2",
"-DRENDERTYPESDL=1", "-DRENDERTYPESDL=1",
"-DMIXERTYPESDL=1", "-DMIXERTYPESDL=1",
@ -3625,7 +3614,6 @@
"-D_FORTIFY_SOURCE=2", "-D_FORTIFY_SOURCE=2",
"-DUSE_LIBPNG", "-DUSE_LIBPNG",
"-DUSE_LIBVPX", "-DUSE_LIBVPX",
"-DHAVE_INTTYPES",
"-DSDL_TARGET=2", "-DSDL_TARGET=2",
"-DRENDERTYPESDL=1", "-DRENDERTYPESDL=1",
"-DMIXERTYPESDL=1", "-DMIXERTYPESDL=1",
@ -3735,7 +3723,6 @@
"-D_THREAD_SAFE", "-D_THREAD_SAFE",
"-DNO_GCC_BUILTINS", "-DNO_GCC_BUILTINS",
"-D_FORTIFY_SOURCE=2", "-D_FORTIFY_SOURCE=2",
"-DHAVE_INTTYPES",
"-DSDL_TARGET=2", "-DSDL_TARGET=2",
"-DRENDERTYPESDL=1", "-DRENDERTYPESDL=1",
"-DMIXERTYPESDL=1", "-DMIXERTYPESDL=1",
@ -3846,7 +3833,6 @@
"-D_THREAD_SAFE", "-D_THREAD_SAFE",
"-DNO_GCC_BUILTINS", "-DNO_GCC_BUILTINS",
"-D_FORTIFY_SOURCE=2", "-D_FORTIFY_SOURCE=2",
"-DHAVE_INTTYPES",
"-DSDL_TARGET=2", "-DSDL_TARGET=2",
"-DRENDERTYPESDL=1", "-DRENDERTYPESDL=1",
"-DMIXERTYPESDL=1", "-DMIXERTYPESDL=1",
@ -3957,7 +3943,6 @@
"-D_THREAD_SAFE", "-D_THREAD_SAFE",
"-DNO_GCC_BUILTINS", "-DNO_GCC_BUILTINS",
"-D_FORTIFY_SOURCE=2", "-D_FORTIFY_SOURCE=2",
"-DHAVE_INTTYPES",
"-DSDL_TARGET=2", "-DSDL_TARGET=2",
"-DRENDERTYPESDL=1", "-DRENDERTYPESDL=1",
"-DMIXERTYPESDL=1", "-DMIXERTYPESDL=1",
@ -4063,7 +4048,6 @@
"-D_THREAD_SAFE", "-D_THREAD_SAFE",
"-DNO_GCC_BUILTINS", "-DNO_GCC_BUILTINS",
"-D_FORTIFY_SOURCE=2", "-D_FORTIFY_SOURCE=2",
"-DHAVE_INTTYPES",
"-DSDL_TARGET=2", "-DSDL_TARGET=2",
"-DRENDERTYPESDL=1", "-DRENDERTYPESDL=1",
"-DMIXERTYPESDL=1", "-DMIXERTYPESDL=1",
@ -4170,7 +4154,6 @@
"-D_THREAD_SAFE", "-D_THREAD_SAFE",
"-DNO_GCC_BUILTINS", "-DNO_GCC_BUILTINS",
"-D_FORTIFY_SOURCE=2", "-D_FORTIFY_SOURCE=2",
"-DHAVE_INTTYPES",
"-DSDL_TARGET=2", "-DSDL_TARGET=2",
"-DRENDERTYPESDL=1", "-DRENDERTYPESDL=1",
"-DMIXERTYPESDL=1", "-DMIXERTYPESDL=1",
@ -4273,7 +4256,6 @@
"-D_THREAD_SAFE", "-D_THREAD_SAFE",
"-DNO_GCC_BUILTINS", "-DNO_GCC_BUILTINS",
"-D_FORTIFY_SOURCE=2", "-D_FORTIFY_SOURCE=2",
"-DHAVE_INTTYPES",
"-DSDL_TARGET=2", "-DSDL_TARGET=2",
"-DRENDERTYPESDL=1", "-DRENDERTYPESDL=1",
"-DMIXERTYPESDL=1", "-DMIXERTYPESDL=1",
@ -4380,7 +4362,6 @@
"-D_THREAD_SAFE", "-D_THREAD_SAFE",
"-DNO_GCC_BUILTINS", "-DNO_GCC_BUILTINS",
"-D_FORTIFY_SOURCE=2", "-D_FORTIFY_SOURCE=2",
"-DHAVE_INTTYPES",
"-DSDL_TARGET=2", "-DSDL_TARGET=2",
"-DRENDERTYPESDL=1", "-DRENDERTYPESDL=1",
"-DMIXERTYPESDL=1", "-DMIXERTYPESDL=1",
@ -4483,7 +4464,6 @@
"-D_THREAD_SAFE", "-D_THREAD_SAFE",
"-DNO_GCC_BUILTINS", "-DNO_GCC_BUILTINS",
"-D_FORTIFY_SOURCE=2", "-D_FORTIFY_SOURCE=2",
"-DHAVE_INTTYPES",
"-DSDL_TARGET=2", "-DSDL_TARGET=2",
"-DRENDERTYPESDL=1", "-DRENDERTYPESDL=1",
"-DMIXERTYPESDL=1", "-DMIXERTYPESDL=1",

2
platform/Windows/eduke32.vcxproj
View file

@ -81,7 +81,7 @@
<NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|x64'">nmake /f msvc.mak DEBUG=1 WINBITS=64 RENDERTYPE=SDL</NMakeBuildCommandLine> <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|x64'">nmake /f msvc.mak DEBUG=1 WINBITS=64 RENDERTYPE=SDL</NMakeBuildCommandLine>
<NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|x64'">nmake /f msvc.mak veryclean all DEBUG=1 WINBITS=64 RENDERTYPE=SDL</NMakeReBuildCommandLine> <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|x64'">nmake /f msvc.mak veryclean all DEBUG=1 WINBITS=64 RENDERTYPE=SDL</NMakeReBuildCommandLine>
<NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|x64'">nmake /f msvc.mak veryclean DEBUG=1 WINBITS=64 RENDERTYPE=SDL</NMakeCleanCommandLine> <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|x64'">nmake /f msvc.mak veryclean DEBUG=1 WINBITS=64 RENDERTYPE=SDL</NMakeCleanCommandLine>
<NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|x64'">USE_OPENGL;POLYMER;NOASM;HAVE_INTTYPES;SDL_USEFOLDER;SDL_TARGET=2</NMakePreprocessorDefinitions> <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|x64'">USE_OPENGL;POLYMER;NOASM;SDL_USEFOLDER;SDL_TARGET=2</NMakePreprocessorDefinitions>
<NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release-SDL|x64'">nmake /f msvc.mak WINBITS=64 RENDERTYPE=SDL</NMakeBuildCommandLine> <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release-SDL|x64'">nmake /f msvc.mak WINBITS=64 RENDERTYPE=SDL</NMakeBuildCommandLine>
<NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release-SDL|x64'">nmake /f msvc.mak veryclean all WINBITS=64 RENDERTYPE=SDL</NMakeReBuildCommandLine> <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release-SDL|x64'">nmake /f msvc.mak veryclean all WINBITS=64 RENDERTYPE=SDL</NMakeReBuildCommandLine>
<NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release-SDL|x64'">nmake /f msvc.mak veryclean WINBITS=64 RENDERTYPE=SDL</NMakeCleanCommandLine> <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release-SDL|x64'">nmake /f msvc.mak veryclean WINBITS=64 RENDERTYPE=SDL</NMakeCleanCommandLine>

6
source/build/include/compat.h
View file

@ -293,11 +293,11 @@ defined __x86_64__ || defined __amd64__ || defined _M_X64 || defined _M_IA64 ||
#ifndef __STDC_LIMIT_MACROS #ifndef __STDC_LIMIT_MACROS
# define __STDC_LIMIT_MACROS # define __STDC_LIMIT_MACROS
#endif #endif
#if defined(HAVE_INTTYPES) || defined(__cplusplus)
#if !defined _MSC_VER || defined __cplusplus
# include <stdint.h> # include <stdint.h>
# include <inttypes.h> # include <inttypes.h>
#else
#elif defined(_MSC_VER)
# include "msvc/inttypes.h" // from http://code.google.com/p/msinttypes/ # include "msvc/inttypes.h" // from http://code.google.com/p/msinttypes/
#endif #endif