libretro/libretro-prboom
1
0
Fork 0
mirror of https://github.com/libretro/libretro-prboom.git synced 2024-11-26 17:50:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Take out some unnecessary defines

Browse Source
This commit is contained in:
twinaphex 2015-11-03 22:05:59 +01:00
parent 4c14125a25
commit 7d89f311b8
12 changed files with 14 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -207,7 +207,7 @@ include Makefile.common
OBJECTS = $(SOURCES_C:.c=.o)
DEFINES = -DHAVE_INTTYPES_H -D__LIBRETRO__ -DHAVE_MEMORY_H -DINLINE=inline -DFPM_DEFAULT -DSIZEOF_INT=4 -DFRONTEND_SUPPORTS_RGB565
DEFINES = -D__LIBRETRO__ -DINLINE=inline -DFPM_DEFAULT -DFRONTEND_SUPPORTS_RGB565
ifeq ($(platform), sncps3)
WARNINGS_DEFINES =

2
Makefile.prboomdata
View File

@ -35,7 +35,7 @@ endif
OBJECTS = data/rd_graphic.o data/rd_output.o data/rd_palette.o data/rd_sound.o data/rd_util.o data/rd_main.o
INCLUDES = -I. -I.. -Idata
DEFINES = -DHAVE_INTTYPES_H -D__LIBRETRO__ -DINLINE=inline
DEFINES = -D__LIBRETRO__ -DINLINE=inline
WARNINGS_DEFINES = -Wall -W -Wno-unused-parameter
CODE_DEFINES = -fomit-frame-pointer -std=gnu99

9
libmad/config.h
View File

@ -1,9 +1,6 @@
/* config.h. Generated by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
/* Define to 1 if you have the <limits.h> header file. */
#define HAVE_LIMITS_H 1
@ -13,9 +10,6 @@
/* Define if your MIPS CPU supports a 2-operand MADD instruction. */
/* #undef HAVE_MADD_ASM */
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
@ -55,9 +49,6 @@
/* Define to the version of this package. */
#define PACKAGE_VERSION "0.15.1b"
/* The size of a `int', as computed by sizeof. */
#define SIZEOF_INT 4
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1

7
libmad/fixed.h
View File

@ -22,17 +22,10 @@
# ifndef LIBMAD_FIXED_H
# define LIBMAD_FIXED_H
# if SIZEOF_INT >= 4
typedef signed int mad_fixed_t;
typedef signed int mad_fixed64hi_t;
typedef unsigned int mad_fixed64lo_t;
# else
typedef signed long mad_fixed_t;
typedef signed long mad_fixed64hi_t;
typedef unsigned long mad_fixed64lo_t;
# endif
# if defined(_MSC_VER)
# define mad_fixed64_t signed __int64

9
libmad/mad.h
View File

@ -22,8 +22,6 @@
# define FPM_INTEL
# define SIZEOF_INT 4
/* Id: version.h,v 1.26 2004/01/23 09:41:33 rob Exp */
# ifndef LIBMAD_VERSION_H
@ -58,17 +56,10 @@ extern char const mad_build[];
# ifndef LIBMAD_FIXED_H
# define LIBMAD_FIXED_H
# if SIZEOF_INT >= 4
typedef signed int mad_fixed_t;
typedef signed int mad_fixed64hi_t;
typedef unsigned int mad_fixed64lo_t;
# else
typedef signed long mad_fixed_t;
typedef signed long mad_fixed64hi_t;
typedef unsigned long mad_fixed64lo_t;
# endif
# if defined(_MSC_VER)
# define mad_fixed64_t signed __int64

9
libmad/msvc++/config.h
View File

@ -1,9 +1,6 @@
/* config.h. Generated by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
/* Define to 1 if you have the <limits.h> header file. */
#define HAVE_LIMITS_H 1
@ -13,9 +10,6 @@
/* Define if your MIPS CPU supports a 2-operand MADD instruction. */
/* #undef HAVE_MADD_ASM */
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
@ -55,9 +49,6 @@
/* Define to the version of this package. */
#define PACKAGE_VERSION "0.15.1b"
/* The size of a `int', as computed by sizeof. */
#define SIZEOF_INT 4
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1

11
libmad/msvc++/mad.h
View File

@ -22,10 +22,6 @@
# define FPM_INTEL
# define SIZEOF_INT 4
/* Id: version.h,v 1.24 2003/05/27 22:40:37 rob Exp */
# ifndef LIBMAD_VERSION_H
@ -60,17 +56,10 @@ extern char const mad_build[];
# ifndef LIBMAD_FIXED_H
# define LIBMAD_FIXED_H
# if SIZEOF_INT >= 4
typedef signed int mad_fixed_t;
typedef signed int mad_fixed64hi_t;
typedef unsigned int mad_fixed64lo_t;
# else
typedef signed long mad_fixed_t;
typedef signed long mad_fixed64hi_t;
typedef unsigned long mad_fixed64lo_t;
# endif
# if defined(_MSC_VER)
# define mad_fixed64_t signed __int64

2
libretro/jni/Android.mk
View File

@ -24,6 +24,6 @@ include $(ROOT_DIR)/Makefile.common
LOCAL_SRC_FILES = $(SOURCES_C)
LOCAL_CFLAGS += -O3 -DHAVE_LIBMAD -DMUSIC_SUPPORT -DINLINE=inline -DHAVE_INTTYPES_H -DHAVE_MEMORY_H -D__LIBRETRO__ -DFPM_DEFAULT -DSIZEOF_INT=4 -DFRONTEND_SUPPORTS_RGB565
LOCAL_CFLAGS += -O3 -DHAVE_LIBMAD -DMUSIC_SUPPORT -DINLINE=inline -D__LIBRETRO__ -DFPM_DEFAULT -DFRONTEND_SUPPORTS_RGB565
include $(BUILD_SHARED_LIBRARY)

8
libretro/msvc/msvc-2003-xbox1/msvc-2003-xbox1.vcproj
View File

@ -22,7 +22,7 @@
Optimization="0"
OptimizeForProcessor="2"
AdditionalIncludeDirectories="&quot;$(SolutionDir)\msvc-2003-xbox1&quot;"
PreprocessorDefinitions="_DEBUG;_XBOX;_LIB;HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;INLINE=_inline;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;HAVE_MEMORY_H;FPM_DEFAULT;SIZEOF_INT=4;_XBOX1"
PreprocessorDefinitions="_DEBUG;_XBOX;_LIB;HAVE_LIBMAD;MUSIC_SUPPORT;INLINE=_inline;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;FPM_DEFAULT;_XBOX1"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@ -91,7 +91,7 @@
OmitFramePointers="TRUE"
OptimizeForProcessor="2"
AdditionalIncludeDirectories="&quot;$(SolutionDir)\msvc-2003-xbox1&quot;"
PreprocessorDefinitions="NDEBUG;_XBOX;PROFILE;FASTCAP;_LIB;HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;INLINE=_inline;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;HAVE_MEMORY_H;FPM_DEFAULT;SIZEOF_INT=4;_XBOX1"
PreprocessorDefinitions="NDEBUG;_XBOX;PROFILE;FASTCAP;_LIB;HAVE_LIBMAD;MUSIC_SUPPORT;INLINE=_inline;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;FPM_DEFAULT;_XBOX1"
StringPooling="TRUE"
RuntimeLibrary="0"
BufferSecurityCheck="TRUE"
@ -127,7 +127,7 @@
OmitFramePointers="TRUE"
OptimizeForProcessor="2"
AdditionalIncludeDirectories="&quot;$(SolutionDir)\msvc-2003-xbox1&quot;"
PreprocessorDefinitions="NDEBUG;_XBOX;_LIB;HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;INLINE=_inline;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;HAVE_MEMORY_H;FPM_DEFAULT;SIZEOF_INT=4;_XBOX1"
PreprocessorDefinitions="NDEBUG;_XBOX;_LIB;HAVE_LIBMAD;MUSIC_SUPPORT;INLINE=_inline;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;FPM_DEFAULT;_XBOX1"
StringPooling="TRUE"
RuntimeLibrary="0"
BufferSecurityCheck="TRUE"
@ -163,7 +163,7 @@
OmitFramePointers="TRUE"
OptimizeForProcessor="2"
AdditionalIncludeDirectories="&quot;$(SolutionDir)\msvc-2003-xbox1&quot;"
PreprocessorDefinitions="NDEBUG;_XBOX;LTCG;_LIB;HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;INLINE=_inline;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;HAVE_MEMORY_H;FPM_DEFAULT;SIZEOF_INT=4;_XBOX1"
PreprocessorDefinitions="NDEBUG;_XBOX;LTCG;_LIB;HAVE_LIBMAD;MUSIC_SUPPORT;INLINE=_inline;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;FPM_DEFAULT;_XBOX1"
StringPooling="TRUE"
RuntimeLibrary="0"
BufferSecurityCheck="TRUE"

12
libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
View File

@ -769,7 +769,7 @@
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PreprocessorDefinitions>_DEBUG;_XBOX;_XBOX360;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;__LIBRETRO__;HAVE_MEMORY_H;INLINE=_inline;FPM_DEFAULT;SIZEOF_INT=4;FRONTEND_SUPPORTS_RGB565</PreprocessorDefinitions>
<PreprocessorDefinitions>_DEBUG;_XBOX;_XBOX360;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;__LIBRETRO__;INLINE=_inline;FPM_DEFAULT;FRONTEND_SUPPORTS_RGB565</PreprocessorDefinitions>
<CallAttributedProfiling>Callcap</CallAttributedProfiling>
<AdditionalIncludeDirectories>src;src/libretro;libmad;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
@ -789,7 +789,7 @@
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PreprocessorDefinitions>_DEBUG;_XBOX;_XBOX360;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;__LIBRETRO__;HAVE_MEMORY_H;INLINE=_inline;FPM_DEFAULT;SIZEOF_INT=4;FRONTEND_SUPPORTS_RGB565</PreprocessorDefinitions>
<PreprocessorDefinitions>_DEBUG;_XBOX;_XBOX360;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;__LIBRETRO__;INLINE=_inline;FPM_DEFAULT;FRONTEND_SUPPORTS_RGB565</PreprocessorDefinitions>
<CallAttributedProfiling>Callcap</CallAttributedProfiling>
<AdditionalIncludeDirectories>src;src/libretro;libmad;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
@ -810,7 +810,7 @@
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PreprocessorDefinitions>NDEBUG;_XBOX;_XBOX360;PROFILE;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;__LIBRETRO__;HAVE_MEMORY_H;INLINE=_inline;FPM_DEFAULT;SIZEOF_INT=4;FRONTEND_SUPPORTS_RGB565</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;_XBOX;_XBOX360;PROFILE;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;__LIBRETRO__;INLINE=_inline;FPM_DEFAULT;FRONTEND_SUPPORTS_RGB565</PreprocessorDefinitions>
<CallAttributedProfiling>Callcap</CallAttributedProfiling>
<AdditionalIncludeDirectories>src;src/libretro;libmad;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
@ -835,7 +835,7 @@
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PreprocessorDefinitions>NDEBUG;_XBOX;_XBOX360;PROFILE;FASTCAP;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;__LIBRETRO__;HAVE_MEMORY_H;INLINE=_inline;FPM_DEFAULT;SIZEOF_INT=4;FRONTEND_SUPPORTS_RGB565</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;_XBOX;_XBOX360;PROFILE;FASTCAP;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;__LIBRETRO__;INLINE=_inline;FPM_DEFAULT;FRONTEND_SUPPORTS_RGB565</PreprocessorDefinitions>
<AdditionalIncludeDirectories>src;src/libretro;libmad;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
@ -857,7 +857,7 @@
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PreprocessorDefinitions>NDEBUG;_XBOX;_XBOX360;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;HAVE_STDINT_H;__LIBRETRO__;HAVE_MEMORY_H;INLINE=_inline;FPM_DEFAULT;SIZEOF_INT=4;FRONTEND_SUPPORTS_RGB565</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;_XBOX;_XBOX360;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_STDINT_H;__LIBRETRO__;INLINE=_inline;FPM_DEFAULT;FRONTEND_SUPPORTS_RGB565</PreprocessorDefinitions>
<AdditionalIncludeDirectories>src;src/libretro;libmad;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
@ -879,7 +879,7 @@
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PreprocessorDefinitions>NDEBUG;_XBOX;_XBOX360;LTCG;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;HAVE_INTTYPES_H;__LIBRETRO__;HAVE_MEMORY_H;INLINE=_inline;FPM_DEFAULT;SIZEOF_INT=4;FRONTEND_SUPPORTS_RGB565</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;_XBOX;_XBOX360;LTCG;_LIB;%(PreprocessorDefinitions);HAVE_LIBMAD;MUSIC_SUPPORT;__LIBRETRO__;INLINE=_inline;FPM_DEFAULT;FRONTEND_SUPPORTS_RGB565</PreprocessorDefinitions>
<AdditionalIncludeDirectories>src;src/libretro;libmad;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>

2
libretro/msvc/msvc-2010/msvc-2010.vcxproj
View File

@ -68,7 +68,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>HAVE_LIBMAD;MUSIC_SUPPORT;_WIN32;HAVE_INTTYPES_H;HAVE_STRLWR;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;HAVE_MEMORY_H;INLINE=_inline;FPM_DEFAULT;SIZEOF_INT=4;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
<PreprocessorDefinitions>HAVE_LIBMAD;MUSIC_SUPPORT;_WIN32;HAVE_STRLWR;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;INLINE=_inline;FPM_DEFAULT;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>

3
src/config.h
View File

@ -23,9 +23,6 @@ extern int SCREENHEIGHT;
#define HAVE_STRLWR
#endif
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
#ifdef HAVE_NET
/* Define to 1 if you have the `inet_aton' function. */