TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove HAVE_STRUCT_TIMEVAL

Browse source 
SConstruct defines it for all platforms.  It is only false on Mac OS 9,
which is no longer supported.
This commit is contained in:
Kp 2015-10-27 03:04:49 +00:00
parent e7c65dbc3f
commit edea687627
3 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SConstruct
View file

@ -2610,12 +2610,12 @@ class DXXCommon(LazyObjectConstructor):
ogllibs = ('opengl32',)
tools = ['mingw']
def adjust_environment(self,program,env):
env.Append(CPPDEFINES = ['_WIN32', 'HAVE_STRUCT_TIMEVAL', 'WIN32_LEAN_AND_MEAN'])
env.Append(CPPDEFINES = ['_WIN32', 'WIN32_LEAN_AND_MEAN'])
class DarwinPlatformSettings(_PlatformSettings):
def __init__(self,program,user_settings):
DXXCommon._PlatformSettings.__init__(self,program,user_settings)
def adjust_environment(self,program,env):
env.Append(CPPDEFINES = ['HAVE_STRUCT_TIMESPEC', 'HAVE_STRUCT_TIMEVAL', '__unix__'])
env.Append(CPPDEFINES = ['HAVE_STRUCT_TIMESPEC', '__unix__'])
env.Append(CPPPATH = [os.path.join(os.getenv("HOME"), 'Library/Frameworks/SDL.framework/Headers'), '/Library/Frameworks/SDL.framework/Headers'])
env.Append(FRAMEWORKS = ['ApplicationServices', 'Cocoa', 'SDL'])
if (self.user_settings.opengl == 1) or (self.user_settings.opengles == 1):
@ -2628,7 +2628,7 @@ class DXXCommon(LazyObjectConstructor):
user_settings = self.user_settings
return (user_settings.opengles_lib, 'EGL') if user_settings.opengles else ('GL', 'GLU')
def adjust_environment(self,program,env):
env.Append(CPPDEFINES = ['HAVE_STRUCT_TIMESPEC', 'HAVE_STRUCT_TIMEVAL'])
env.Append(CPPDEFINES = ['HAVE_STRUCT_TIMESPEC'])
env.Append(CXXFLAGS = ['-pthread'])
def __init__(self):

1
contrib/dxx-rebirth.xcodeproj/project.pbxproj
View file

@ -1978,7 +1978,6 @@
"DEBUG=1",
"$(inherited)",
"HAVE_STRUCT_TIMESPEC=1",
"HAVE_STRUCT_TIMEVAL=1",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",

8
d2x-rebirth/libmve/mveplay.cpp
View file

@ -103,14 +103,6 @@ static int end_movie_handler(unsigned char, unsigned char, const unsigned char *
* timer handlers
*************************/
#if !defined(HAVE_STRUCT_TIMEVAL) || !HAVE_STRUCT_TIMEVAL
struct timeval
{
long tv_sec;
long tv_usec;
};
#endif
/*
* timer variables
*/