patchFreeciv - Patches: patch #4088, Included dependencies of...

 
 
Show feedback again

patch #4088: Included dependencies of sdl-clients

Submitted by:  Marko Lindqvist <cazfi>
Submitted on:  Wed 14 Aug 2013 09:41:05 AM UTC  
 
Category: client-sdlPriority: 5 - Normal
Status: DonePrivacy: Public
Assigned to: Marko Lindqvist <cazfi>Open/Closed: Closed
Planned Release: 2.5.0, 2.6.0

Add a New Comment (Rich MarkupRich Markup):
   

You are not logged in

Please log in, so followups can be emailed to you.

 

Sat 19 Oct 2013 12:28:46 AM UTC, SVN revision 23596:

Link sdl-client against external SDL_gfx instead of including copy of
some of its sources.

See patch #4088

(Browse SVN revision 23596)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sat 19 Oct 2013 12:28:39 AM UTC, SVN revision 23595:

Link sdl-client against external SDL_gfx instead of including copy of
some of its sources.

See patch #4088

(Browse SVN revision 23595)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Wed 16 Oct 2013 09:08:12 PM UTC, comment #3:

- Really removed SDL_ttf configure check from S2_5 version, and consequent linking against it

(file #19197)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Mon 14 Oct 2013 12:54:25 AM UTC, comment #2:

These versions of the patches omit SDL_ttf part. It's better to go forward with the working parts than to leave patch catching bitrot.

(file #19173, file #19174)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Mon 14 Oct 2013 12:20:10 AM UTC, comment #1:

Attached patch makes sdl-client to link against SDL_gfx and SDL_ttf instead of using included copies of them. In addition to applying the patch one should remove client/gui-sdl/SDL_* (even when testing so that compilation does not find wrong headers).
Unfortunately this seems to break client somewhat - presumably we depend on patched SDL_ttf.

(file #19171, file #19172)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Wed 14 Aug 2013 09:41:05 AM UTC, original submission:

Currently gui-sdl and gui-sdl2 include copies of sourcefiles from SDL_gfx and SDL_ttf (or SDL2 equivalents). They should link against those libraries instead.
For gui-sdl2 my plan is to get it working with included copies first (esp. as there's no releases of SDL2_gfx yet, only development version).

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.

 

(Note: upload size limit is set to 1024 kB, after insertion of the required escape characters.)

Attach File(s):
   
   
Comment:
   

Attached Files
file #19173:  SDLDependencies-2.patch added by cazfi (5kB - text/x-diff)
file #19171:  SDLDependencies.patch added by cazfi (5kB - text/x-diff)

 

Depends on the following items: None found

Items that depend on this one: None found

 

Carbon-Copy List
  • -unavailable- added by cazfi (Submitted the item)
  •  

    Do you think this task is very important?
    If so, you can click here to add your encouragement to it.
    This task has 0 encouragements so far.

    Only logged-in users can vote.

     

    Please enter the title of George Orwell's famous dystopian book (it's a date):

     

     

    Follow 10 latest changes.

    Date Changed By Updated Field Previous Value => Replaced By
    Sun 20 Oct 2013 06:10:09 AM UTCcazfiStatusReady For Test=>Done
      Assigned toNone=>cazfi
      Open/ClosedOpen=>Closed
    Wed 16 Oct 2013 09:08:12 PM UTCcazfiAttached File-=>Added SDLDependencies-S2_5-3.patch, #19197
    Mon 14 Oct 2013 12:54:25 AM UTCcazfiAttached File-=>Added SDLDependencies-2.patch, #19173
      Attached File-=>Added SDLDependencies-S2_5-2.patch, #19174
      StatusIn Progress=>Ready For Test
    Mon 14 Oct 2013 12:20:10 AM UTCcazfiAttached File-=>Added SDLDependencies-S2_5.patch, #19172
      StatusNone=>In Progress
    Mon 14 Oct 2013 12:20:09 AM UTCcazfiAttached File-=>Added SDLDependencies.patch, #19171
    Show feedback again

    Back to the top


    Powered by Savane 3.1-cleanup