[haiku-commits] haiku: hrev43714 - src/preferences/3drendering

  • From: anevilyak@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 3 Feb 2012 03:49:32 +0100 (CET)

hrev43714 adds 1 changeset to branch 'master'
old head: 64629da6393c9602297042f118f9d0c110e60a12
new head: ab992e7851d74b283caf076ce05f76d406e857c2

----------------------------------------------------------------------------

ab992e7: Adjust Jamfile to fix dependencies.
  
  3DRendering wasn't depending on the mesa headers as needed, so its
  build would break in a multi-job jam if mesa hadn't already been
  downloaded.

                                      [ Rene Gollent <anevilyak@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev43714
Commit:      ab992e7851d74b283caf076ce05f76d406e857c2
URL:         http://cgit.haiku-os.org/haiku/commit/?id=ab992e7
Author:      Rene Gollent <anevilyak@xxxxxxxxx>
Date:        Fri Feb  3 02:48:25 2012 UTC

----------------------------------------------------------------------------

1 files changed, 11 insertions(+), 3 deletions(-)
src/preferences/3drendering/Jamfile |   14 +++++++++++---

----------------------------------------------------------------------------

diff --git a/src/preferences/3drendering/Jamfile 
b/src/preferences/3drendering/Jamfile
index 17f219c..bed8510 100644
--- a/src/preferences/3drendering/Jamfile
+++ b/src/preferences/3drendering/Jamfile
@@ -2,14 +2,14 @@ SubDir HAIKU_TOP src preferences 3drendering ;
 SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
 
 # For GCC2
-if $(HAIKU_GCC_VERSION[1]) < 3 { 
+if $(HAIKU_GCC_VERSION[1]) < 3 {
        SubDirC++Flags --no-warnings ;
 }
 
 
 UsePrivateHeaders interface ;
 
-Preference 3DRendering :
+local sources =
        OpenGLApp.cpp
        OpenGLWindow.cpp
        OpenGLView.cpp
@@ -18,6 +18,14 @@ Preference 3DRendering :
        ExtensionsView.cpp
        InfoView.cpp
        LogoView.cpp
+       ;
+
+Includes [ FGristFiles $(sources) ] : $(HAIKU_MESA_HEADERS_DEPENDENCY) ;
+       # Dependency needed to trigger downloading/unzipping the package before
+       # compiling the files.
+
+Preference 3DRendering
+       : $(sources)
        : be GL translation libcolumnlistview.a $(HAIKU_LOCALE_LIBS)
                $(TARGET_LIBSUPC++)
        : 3DRendering.rdef
@@ -32,4 +40,4 @@ DoCatalogs 3DRendering :
        InfoView.cpp
        OpenGLWindow.cpp
 ;
-       
+


Other related posts: