Stan` Posted February 19, 2015 Report Share Posted February 19, 2015 (edited) Can as much people as possible test the patch here ?http://trac.wildfiregames.com/ticket/2847It would allow the game to switch to SDL2 (Which would permit to fix the keys locked bug)Thanks in advanceRegards Stan.NOTE : THE PATCH Has been commited it's no longer necessary for you to patch your Svn. THANKS Z for pointing it out Edited February 23, 2015 by stanislas69 Quote Link to comment Share on other sites More sharing options...
agentx Posted February 19, 2015 Report Share Posted February 19, 2015 I've updated to b16355, what do I have to do to test the diff before running make? Have Ubuntu 14.04. Quote Link to comment Share on other sites More sharing options...
Stan` Posted February 19, 2015 Author Report Share Posted February 19, 2015 Patch you revision with it, compile, try to launch atlas and tell me if it works (Comment on the ticket) Quote Link to comment Share on other sites More sharing options...
agentx Posted February 19, 2015 Report Share Posted February 19, 2015 (edited) > Patch your revision with itHow does that work with RapidSVN? Edited February 19, 2015 by agentx Quote Link to comment Share on other sites More sharing options...
Stan` Posted February 19, 2015 Author Report Share Posted February 19, 2015 Maybe this will help http://kkpradeeban.blogspot.fr/2009/04/documentation.html Quote Link to comment Share on other sites More sharing options...
agentx Posted February 19, 2015 Report Share Posted February 19, 2015 I put the diff in root, called patch and got:ax@T3000:/Daten/Projects/Osiris/ps/trunk$ patch -p0 < fix-atlas-sdl2.diff (Stripping trailing CRs from patch; use --binary to disable.)can't find file to patch at input line 5Perhaps you used the wrong -p or --strip option?The text leading up to this was:--------------------------|diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp|index 54b8463..26b6b11 100644|--- a/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp|+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp--------------------------File to patch: What does it want? Quote Link to comment Share on other sites More sharing options...
leper Posted February 19, 2015 Report Share Posted February 19, 2015 -p1 Quote Link to comment Share on other sites More sharing options...
agentx Posted February 19, 2015 Report Share Posted February 19, 2015 thanks, compiling.... Quote Link to comment Share on other sites More sharing options...
agentx Posted February 19, 2015 Report Share Posted February 19, 2015 Atlas starts, can copy paste actors, open save maps, anything special to test? Was SDL2 automatically integrated? Quote Link to comment Share on other sites More sharing options...
Stan` Posted February 19, 2015 Author Report Share Posted February 19, 2015 No it was broken (every os except linux use SDL 2) Could you share your specs on the ticket and say it works for you ? Thanks Quote Link to comment Share on other sites More sharing options...
agentx Posted February 19, 2015 Report Share Posted February 19, 2015 elexis wrote:-Ubuntu 14.10-compiled 0ad against SDL2?? Quote Link to comment Share on other sites More sharing options...
Stan` Posted February 19, 2015 Author Report Share Posted February 19, 2015 elexis wrote:-Ubuntu 14.10-compiled 0ad against SDL2??WellFirst line is OS (Captain Obvious)SecondLine is what was special about that build (you and him compiled with sld2 (it was the aim of the patch))So just give your os and it'll be fine Quote Link to comment Share on other sites More sharing options...
leper Posted February 19, 2015 Report Share Posted February 19, 2015 Did you actually pass --sdl2 to update-workspaces.sh? Quote Link to comment Share on other sites More sharing options...
agentx Posted February 19, 2015 Report Share Posted February 19, 2015 No, starting over.... Quote Link to comment Share on other sites More sharing options...
agentx Posted February 19, 2015 Report Share Posted February 19, 2015 What is the apt-get install for sdl2? Quote Link to comment Share on other sites More sharing options...
agentx Posted February 19, 2015 Report Share Posted February 19, 2015 get:==== Building ActorEditor (release) ====test_root.cpp/bin/sh: 1: sdl2-config: not foundLinking test/bin/sh: 1: sdl2-config: not foundHow do I install sdl2-config? sdl-config is present. Quote Link to comment Share on other sites More sharing options...
Stan` Posted February 19, 2015 Author Report Share Posted February 19, 2015 Try this http://lazyfoo.net/tutorials/SDL/01_hello_SDL/linux/index.php Quote Link to comment Share on other sites More sharing options...
historic_bruno Posted February 19, 2015 Report Share Posted February 19, 2015 get:==== Building ActorEditor (release) ====test_root.cpp/bin/sh: 1: sdl2-config: not foundLinking test/bin/sh: 1: sdl2-config: not foundHow do I install sdl2-config? sdl-config is present.Did you install libsdl2-dev? Quote Link to comment Share on other sites More sharing options...
agentx Posted February 19, 2015 Report Share Posted February 19, 2015 Had to download SDL2 and compile it. This guide came to rescue: https://github.com/PluginIO/EX3/wiki/Setting-up-SDL2-in-Ubuntu-12.10 Although I did a hg clone to get the files.Can now make another mark on my list of successfully compiled programs Compiling now 0AD..... Quote Link to comment Share on other sites More sharing options...
agentx Posted February 19, 2015 Report Share Posted February 19, 2015 Here I'm completely lost.ax@T3000:/Daten/Projects/Osiris/ps/trunk/build/workspaces/gcc$ make -j3==== Building tinygettext (release) ======== Building mocks_real (release) ======== Building network (release) ======== Building lobby (release) ======== Building glooxwrapper (release) ======== Building simulation2 (release) ======== Building scriptinterface (release) ======== Building engine (release) ======== Building graphics (release) ======== Building atlas (release) ======== Building gui (release) ======== Building lowlevel (release) ======== Building mongoose (release) ======== Building mocks_test (release) ======== Building AtlasObject (release) ======== Building Collada (release) ======== Building AtlasUI (release) ======== Building pyrogenesis (release) ======== Building test (release) ======== Building ActorEditor (release) ====test_root.cppLinking test../../../binaries/system/libengine.a(VideoMode.o): In function `CVideoMode::SetVideoMode(int, int, int, bool)':/Daten/Projects/Osiris/ps/trunk/build/workspaces/gcc/../../../source/ps/VideoMode.cpp:168: undefined reference to `SDL_SetVideoMode'/Daten/Projects/Osiris/ps/trunk/build/workspaces/gcc/../../../source/ps/VideoMode.cpp:196: undefined reference to `SDL_WM_GrabInput'/Daten/Projects/Osiris/ps/trunk/build/workspaces/gcc/../../../source/ps/VideoMode.cpp:168: undefined reference to `SDL_SetVideoMode'/Daten/Projects/Osiris/ps/trunk/build/workspaces/gcc/../../../source/ps/VideoMode.cpp:198: undefined reference to `SDL_WM_GrabInput'../../../binaries/system/libengine.a(VideoMode.o): In function `CVideoMode::InitSDL()':/Daten/Projects/Osiris/ps/trunk/build/workspaces/gcc/../../../source/ps/VideoMode.cpp:308: undefined reference to `SDL_SetGamma'../../../binaries/system/libengine.a(GameSetup.o): In function `InitSDL':/Daten/Projects/Osiris/ps/trunk/build/workspaces/gcc/../../../source/ps/GameSetup/GameSetup.cpp:665: undefined reference to `SDL_EnableUNICODE'../../../binaries/system/libengine.a(GameSetup.o): In function `InitGraphics(CmdLineArgs const&, int)':/Daten/Projects/Osiris/ps/trunk/build/workspaces/gcc/../../../source/ps/GameSetup/GameSetup.cpp:989: undefined reference to `SDL_WM_SetCaption'../../../binaries/system/libengine.a(GameSetup.o): In function `InitInput':/Daten/Projects/Osiris/ps/trunk/build/workspaces/gcc/../../../source/ps/GameSetup/GameSetup.cpp:550: undefined reference to `SDL_EnableKeyRepeat'../../../binaries/system/libengine.a(HWDetect.o): In function `ReportGLLimits':/Daten/Projects/Osiris/ps/trunk/build/workspaces/gcc/../../../source/ps/GameSetup/HWDetect.cpp:713: undefined reference to `SDL_GetWMInfo'../../../binaries/system/liblowlevel.a(x.o): In function `get_wminfo':/Daten/Projects/Osiris/ps/trunk/build/workspaces/gcc/../../../source/lib/sysdep/os/unix/x/x.cpp:124: undefined reference to `SDL_GetWMInfo'/Daten/Projects/Osiris/ps/trunk/build/workspaces/gcc/../../../source/lib/sysdep/os/unix/x/x.cpp:124: undefined reference to `SDL_GetWMInfo'/Daten/Projects/Osiris/ps/trunk/build/workspaces/gcc/../../../source/lib/sysdep/os/unix/x/x.cpp:124: undefined reference to `SDL_GetWMInfo'/Daten/Projects/Osiris/ps/trunk/build/workspaces/gcc/../../../source/lib/sysdep/os/unix/x/x.cpp:124: undefined reference to `SDL_GetWMInfo'../../../binaries/system/liblowlevel.a(x.o):/Daten/Projects/Osiris/ps/trunk/build/workspaces/gcc/../../../source/lib/sysdep/os/unix/x/x.cpp:124: more undefined references to `SDL_GetWMInfo' followcollect2: error: ld returned 1 exit statusmake[1]: *** [../../../binaries/system/test] Error 1make: *** [test] Error 2 Quote Link to comment Share on other sites More sharing options...
Stan` Posted February 19, 2015 Author Report Share Posted February 19, 2015 I think you forgot the SDL2 flag when building Quote Link to comment Share on other sites More sharing options...
Recommended Posts
Join the conversation
You can post now and register later. If you have an account, sign in now to post with your account.