[PATCH] jam cleanup and g3dviewer for linux

[Yggdrasil]

This is a repost. I probably posted it too hidden the first time, so it was easily missed. They still work in trunk.

https://forum.megaglest.org/index.php?topic=4471.msg29786#msg29786

Here is a patch which gets rid of some unneeded linking (found in debian package) and removes xerces.

Code: [Select]

http://www1.inf.tu-dresden.de/~s1445051/r184-gae-jamcleanup.patch
Another patch which enables g3dviewer for linux:

Code: [Select]

http://www1.inf.tu-dresden.de/~s1445051/r184-gae-g3dviewer.patch
You need to run autogen.sh and configure after applying.

Haven't tested if g3dviewer still works on Windows.

[daniel.santos]

Zoiks!  Sorry this got missed! =)  For clarity, can you please post which branch you made these patches from?  I haven't messed with the TinyXML branch yet.  I'll try to get these in this weekend.

[Yggdrasil]

It is for trunk on sourceforge, no branch. The TinyXML branch got merged into trunk some time ago. TinyXML itself is now part of glestlib.

[silnarm]

Doh! Sorry, I did see it, and meant to fire up the linux box to test & commit it... but I forget things...

I'll throw together a vc project file for the G3D viewer sometime, I actually made one for the map editor a while back, probably a waste of time with a GUI system in the pipeline... and an in game editor to follow, but anyway...

Thanks!

[Yggdrasil]

First one is in, second not. I added it this time to the patch tracker on sourceforge and another patch for the map editor. It's slightly changed to work with revision 304.

https://sourceforge.net/tracker/?group_id=241094&atid=1114829

[silnarm]

Thanks again I don't spend much time on linux atm, but I'll try to get this in soon...

[Yggdrasil]

It's only half commited, at least in trunk. The changes to Jamfile are missing, so g3d viewer is no target in jam and doesn't get build.

Code: [Select]

Index: mk/linux/Jamfile             
===================================================================
--- mk/linux/Jamfile    (Revision 385)                             
+++ mk/linux/Jamfile    (Arbeitskopie)                             
@@ -86,3 +86,17 @@                                                 
   IncludeDir editor : ../shared_lib/$(LIB_INCLUDE_DIRS) $(GLEST_MAP_DIRS) ;
 }                                                                         
                                                                           
+### Viewer ###                                                             
+if $(WX_AVAILABLE) = "yes" {                                               
+  SubDir TOP g3d_viewer ;                                                 
+                                                                           
+  GLEST_VIEWER_DIRS = . ;                                                 
+  for i in $(GLEST_DIRS) {                                                 
+    GLEST_VIEWER_SOURCES += [ Wildcard $(i) : *.cpp *.h ] ;               
+  }                                                                       
+                                                                           
+  Application glest_g3dviewer : $(GLEST_VIEWER_SOURCES) ;                 
+  LinkWith glest_g3dviewer : glestlib ;                                   
+  ExternalLibs glest_g3dviewer : SDL GL GLU WX ;                           
+  IncludeDir glest_g3dviewer : ../shared_lib/$(LIB_INCLUDE_DIRS) $(GLEST_VIEWER_DIRS) ;
+}                                                                                     



[silnarm]

Ooops, I have a habit of only committing as far down the tree as needed, on Windows TortoiseSVN makes it very obvious where that is... If anyone can recommend a good SVN client for linux, I'm all ears!

[Yggdrasil]

It works now.
I only tried kdesvn as a gui. It intregates really good into KDE, has kpart and kio slave. Not sure if it works that well in other desktops.