From: <tz...@us...> - 2006-08-23 02:20:57
|
Revision: 1869 Author: tzlaine Date: 2006-08-22 19:20:52 -0700 (Tue, 22 Aug 2006) ViewCVS: http://svn.sourceforge.net/freeorion?rev=1869&view=rev Log Message: ----------- Made a few small changes to aid in building FO on Macs. Modified Paths: -------------- trunk/FreeOrion/SConstruct trunk/FreeOrion/build_support.py trunk/FreeOrion/client/human/HumanClientApp.cpp Modified: trunk/FreeOrion/SConstruct =================================================================== --- trunk/FreeOrion/SConstruct 2006-07-31 18:21:50 UTC (rev 1868) +++ trunk/FreeOrion/SConstruct 2006-08-23 02:20:52 UTC (rev 1869) @@ -286,7 +286,7 @@ stdout.write('Checking for DevIL OpenGL support... ') devil_gl_check_app = """ #include <IL/ilut.h> -#if !ILUT_USE_OPENGL +#ifndef ILUT_USE_OPENGL #error "DevIL not built with OpenGL support" #endif int main() { Modified: trunk/FreeOrion/build_support.py =================================================================== --- trunk/FreeOrion/build_support.py 2006-07-31 18:21:50 UTC (rev 1868) +++ trunk/FreeOrion/build_support.py 2006-08-23 02:20:52 UTC (rev 1869) @@ -276,7 +276,7 @@ context.env.ParseConfig('sdl-config ' + sdl_config_prefix_flag + ' --cflags ' + (build_dynamic and '--libs' or '--static-libs')) found_it_with_sdl_config = True if not found_it_with_sdl_config: - if not conf.CheckCHeader('SDL/SDL.h') and not conf.CheckCHeader('SDL.h'): + if not conf.CheckCHeader(os.path.join('SDL', 'SDL.h')) and not conf.CheckCHeader('SDL.h'): context.Message('SDL configuration... ') context.Result(False) return False @@ -285,7 +285,7 @@ context.Result(False) return False version_regex = re.compile(r'SDL_MAJOR_VERSION\s*(\d+).*SDL_MINOR_VERSION\s*(\d+).*SDL_PATCHLEVEL\s*(\d+)', re.DOTALL) - if not conf.CheckVersionHeader('SDL', 'SDL_version.h', version_regex, sdl_version, True): + if not conf.CheckVersionHeader('SDL', os.path.join('SDL', 'SDL_version.h'), version_regex, sdl_version, True): context.Message('SDL configuration... ') context.Result(False) return False @@ -294,7 +294,7 @@ link_test_app = """ #include <SDL/SDL.h> #include <SDL/SDL_opengl.h> -int main() +int main(int argc, char** argv) { SDL_Init(SDL_INIT_VIDEO); SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5); @@ -319,9 +319,9 @@ def CheckLibLTDL(context): retval = True - context.Message('Generating libltdl/config.h using libltdl/configure... ') + context.Message('Generating GG/libltdl/config.h using GG/libltdl/configure... ') initial_dir = os.getcwd() - os.chdir('libltdl') + os.chdir(os.path.join('GG', 'libltdl')) configure_run = os.system('./configure > /dev/null') code = os.WEXITSTATUS(configure_run) if code: Modified: trunk/FreeOrion/client/human/HumanClientApp.cpp =================================================================== --- trunk/FreeOrion/client/human/HumanClientApp.cpp 2006-07-31 18:21:50 UTC (rev 1868) +++ trunk/FreeOrion/client/human/HumanClientApp.cpp 2006-08-23 02:20:52 UTC (rev 1869) @@ -446,13 +446,8 @@ EventType gg_event = MOUSEMOVE; GG::Key key = GGKeyFromSDLKey(event.key.keysym); Uint32 key_mods = SDL_GetModState(); -#ifdef __APPLE__ - GG::Pt mouse_pos(event.motion.x, m_app_height - event.motion.y); - GG::Pt mouse_rel(event.motion.xrel, -event.motion.yrel); -#else GG::Pt mouse_pos(event.motion.x, event.motion.y); GG::Pt mouse_rel(event.motion.xrel, event.motion.yrel); -#endif switch (event.type) { case SDL_KEYDOWN: |