Changeset 1995Tweet

Timestamp:

Oct 9, 2012, 12:34:40 PM (11 years ago)

Author:

sam

Message:

build: upgrade glew binaries to 1.9.0 and rename the contrib directory
to external so as to avoid some autocompletion collisions with "configure".

Location:

trunk

Files:

• .gitignore (modified) (1 diff)
• build/autotools/m4 (modified) (1 prop)
• build/autotools/m4/lol-gl.m4 (modified) (1 diff)
• build/check-source.sh (modified) (1 diff)
• build/lol-build (modified) (5 diffs)
• build/vs2010/Lol.Core.Vars.props (modified) (7 diffs)
• configure.ac (modified) (1 diff)
• external (moved) (moved from trunk/contrib)
• external/NOTES (modified) (2 diffs)
• external/glew-1.6.0 (deleted)
• external/glew-1.7.0 (deleted)
• external/glew-1.9.0 (added)
• external/glew-1.9.0/include (added)
• external/glew-1.9.0/include/GL (added)
• external/glew-1.9.0/include/GL/glew.h (added)
• external/glew-1.9.0/include/GL/glxew.h (added)
• external/glew-1.9.0/include/GL/wglew.h (added)
• external/glew-1.9.0/lib (added)
• external/glew-1.9.0/lib/i686-w64-mingw32 (added)
• external/glew-1.9.0/lib/i686-w64-mingw32/glew32s.lib (added)
• external/glew-1.9.0/lib/x86_64-w64-mingw32 (added)
• external/glew-1.9.0/lib/x86_64-w64-mingw32/glew32s.lib (added)
• test (modified) (1 prop)
• test/math (modified) (1 prop)
• test/sandbox (modified) (1 prop)
• test/xolotl (modified) (1 prop)
• tools (modified) (1 prop)
• tools/neercs/term (modified) (1 prop)
• tools/vslol (modified) (1 prop)
• tools/vslol/AssemblyInfo.cs (modified) (1 diff)
• tools/vslol/MenuGenerateCompilers.cs (modified) (1 diff)
• tools/vslol/source.extension.vsixmanifest (modified) (1 diff)
• tutorial (modified) (1 prop)

trunk/.gitignore

@@ -57 +57 @@
 build/vs2010/*.log
 build/vs2010/*.XGD
-# Do not exclude anything in contrib. There is no way to do this recursively
+# Do not exclude anything in external. There is no way to do this recursively
 # but the nesting below is currently one level more than our current max.
-!contrib/*
-!contrib/*/*
-!contrib/*/*/*
-!contrib/*/*/*/*
-!contrib/*/*/*/*/*
-!contrib/*/*/*/*/*/*
-!contrib/*/*/*/*/*/*/*
+!external/*
+!external/*/*
+!external/*/*/*
+!external/*/*/*/*
+!external/*/*/*/*/*
+!external/*/*/*/*/*/*
+!external/*/*/*/*/*/*/*
 # Our binaries
 test/benchsuite

trunk/build/autotools/m4/lol-gl.m4

@@ -101 +101 @@
 AC_CHECK_HEADER(glew.h,
  [LIBS_save="${LIBS}"
-  LIBS="${LIBS} -lglew32 ${GL_LIBS}"
-  AC_MSG_CHECKING(for glewInit in -lglew32)
+  LIBS="${LIBS} -lglew32s ${GL_LIBS}"
+  AC_MSG_CHECKING(for glewInit in -lglew32s)
   AC_TRY_LINK(
    [#include <glew.h>],
    [glewInit();],
    [ac_cv_my_have_glew="yes"
-    GL_LIBS="-lglew32 ${GL_LIBS}"
+    GL_LIBS="-lglew32s ${GL_LIBS}"
     AC_MSG_RESULT(yes)],
    [AC_MSG_RESULT(no)])

trunk/build/check-source.sh

@@ -92 +92 @@
     case "$file" in
       # These files aren't ours, don't fix
-      src/bullet/*|contrib/*|*/generated/*|web/plugins/*)
+      src/bullet/*|external/*|*/generated/*|web/plugins/*)
           :
           ;;

trunk/build/lol-build

@@ -81 +81 @@
     case "${MSYSTEM}" in
         MINGW32|MINGW64)
-            PATH="$PATH:./contrib/gtk-2.22.1/bin"
-            M4PATH="$M4PATH:./contrib/gtk-2.22.1/share/aclocal"
+            PATH="$PATH:./external/gtk-2.22.1/bin"
+            M4PATH="$M4PATH:./external/gtk-2.22.1/share/aclocal"
             ;;
     esac
@@ -121 +121 @@
                 BUILDFLAGS=
             fi
-            PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/gtkglarea-2.0.1/lib/pkgconfig"
-            PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/libcaca-0.99.beta18/lib/pkgconfig"
-            LDFLAGS="$LDFLAGS -L$PWD/contrib/glew-1.7.0/lib/i686-w64-mingw32"
-            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.15/lib/i686-w64-mingw32"
-            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-image-1.2.10/lib/i686-w64-mingw32"
-            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-mixer-1.2.11/lib/i686-w64-mingw32"
-            LDFLAGS="$LDFLAGS -L$PWD/contrib/gtk-2.22.1/lib"
-            LDFLAGS="$LDFLAGS -L$PWD/contrib/gtk-2.22.1/bin"
-            LDFLAGS="$LDFLAGS -L$PWD/contrib/gtkglarea-2.0.1/lib"
-            LDFLAGS="$LDFLAGS -L$PWD/contrib/libcaca-0.99.beta18/lib/i686-w64-mingw32"
+            PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/external/gtkglarea-2.0.1/lib/pkgconfig"
+            PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/external/libcaca-0.99.beta18/lib/pkgconfig"
+            LDFLAGS="$LDFLAGS -L$PWD/external/glew-1.9.0/lib/i686-w64-mingw32"
+            LDFLAGS="$LDFLAGS -L$PWD/external/sdl-1.2.15/lib/i686-w64-mingw32"
+            LDFLAGS="$LDFLAGS -L$PWD/external/sdl-image-1.2.10/lib/i686-w64-mingw32"
+            LDFLAGS="$LDFLAGS -L$PWD/external/sdl-mixer-1.2.11/lib/i686-w64-mingw32"
+            LDFLAGS="$LDFLAGS -L$PWD/external/gtk-2.22.1/lib"
+            LDFLAGS="$LDFLAGS -L$PWD/external/gtk-2.22.1/bin"
+            LDFLAGS="$LDFLAGS -L$PWD/external/gtkglarea-2.0.1/lib"
+            LDFLAGS="$LDFLAGS -L$PWD/external/libcaca-0.99.beta18/lib/i686-w64-mingw32"
             ;;
         win*-amd64)
@@ -146 +146 @@
                 BUILDFLAGS=
             fi
-            PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/gtkglarea-2.0.1/lib/pkgconfig"
-            PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/libcaca-0.99.beta18/lib/pkgconfig"
-            LDFLAGS="$LDFLAGS -L$PWD/contrib/glew-1.7.0/lib/x86_64-w64-mingw32"
-            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.15/lib/x86_64-w64-mingw32"
-            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-image-1.2.10/lib/x86_64-w64-mingw32"
-            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-mixer-1.2.11/lib/x86_64-w64-mingw32"
-            LDFLAGS="$LDFLAGS -L$PWD/contrib/libcaca-0.99.beta18/lib/x86_64-w64-mingw32"
+            PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/external/gtkglarea-2.0.1/lib/pkgconfig"
+            PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/external/libcaca-0.99.beta18/lib/pkgconfig"
+            LDFLAGS="$LDFLAGS -L$PWD/external/glew-1.9.0/lib/x86_64-w64-mingw32"
+            LDFLAGS="$LDFLAGS -L$PWD/external/sdl-1.2.15/lib/x86_64-w64-mingw32"
+            LDFLAGS="$LDFLAGS -L$PWD/external/sdl-image-1.2.10/lib/x86_64-w64-mingw32"
+            LDFLAGS="$LDFLAGS -L$PWD/external/sdl-mixer-1.2.11/lib/x86_64-w64-mingw32"
+            LDFLAGS="$LDFLAGS -L$PWD/external/libcaca-0.99.beta18/lib/x86_64-w64-mingw32"
             ;;
         *-i386)
@@ -191 +191 @@
             ;;
         win*-i386|win*-amd64)
-            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-1.2.15/include"
-            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-image-1.2.10/include"
-            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-mixer-1.2.11/include"
-            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/glew-1.7.0/include/GL -DGLEW_STATIC"
-            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/lib/glib-2.0/include"
-            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/lib/gtk-2.0/include"
-            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/include/glib-2.0"
-            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/include/gtk-2.0"
-            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/include/cairo"
-            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/include/pango-1.0"
-            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/include/gdk-pixbuf-2.0"
-            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/include/atk-1.0"
-            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtkglarea-2.0.1/include"
+            CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-1.2.15/include"
+            CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-image-1.2.10/include"
+            CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-mixer-1.2.11/include"
+            CPPFLAGS="$CPPFLAGS -I$PWD/external/glew-1.9.0/include/GL -DGLEW_STATIC"
+            CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/lib/glib-2.0/include"
+            CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/lib/gtk-2.0/include"
+            CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/include/glib-2.0"
+            CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/include/gtk-2.0"
+            CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/include/cairo"
+            CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/include/pango-1.0"
+            CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/include/gdk-pixbuf-2.0"
+            CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/include/atk-1.0"
+            CPPFLAGS="$CPPFLAGS -I$PWD/external/gtkglarea-2.0.1/include"
             CPPFLAGS="$CPPFLAGS -mms-bitfields"
             LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++"
@@ -210 +210 @@
             GTK_LIBS="$GTK_LIBS -lglib-2.0 -lgthread-2.0 -lgobject-2.0"
 
-            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/libcaca-0.99.beta18/include -DCACA_STATIC"
+            CPPFLAGS="$CPPFLAGS -I$PWD/external/libcaca-0.99.beta18/include -DCACA_STATIC"
 
             PATH="$PATH" PKG_CONFIG_PATH="$PKG_CONFIG_PATH" ./configure $HOSTFLAGS $BUILDFLAGS CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" GTK_LIBS="$GTK_LIBS"

trunk/build/vs2010/Lol.Core.Vars.props

@@ -3 +3 @@
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
-    <ContribDir>$(SolutionDir)\..\..\contrib</ContribDir>
+    <ExternalDir>$(SolutionDir)\..\..\external</ExternalDir>
 
     <!-- Flex & Bison -->
-    <FlexDir>$(ContribDir)\flex-2.5.35</FlexDir>
+    <FlexDir>$(ExternalDir)\flex-2.5.35</FlexDir>
     <FlexIncludes>$(FlexDir)\include</FlexIncludes>
 
     <!-- SDL -->
-    <SdlDir>$(ContribDir)\sdl-1.2.15</SdlDir>
-    <SdlImageDir>$(ContribDir)\sdl-image-1.2.10</SdlImageDir>
-    <SdlMixerDir>$(ContribDir)\sdl-mixer-1.2.11</SdlMixerDir>
+    <SdlDir>$(ExternalDir)\sdl-1.2.15</SdlDir>
+    <SdlImageDir>$(ExternalDir)\sdl-image-1.2.10</SdlImageDir>
+    <SdlMixerDir>$(ExternalDir)\sdl-mixer-1.2.11</SdlMixerDir>
     <SdlIncludes>$(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include</SdlIncludes>
     <SdlLibs Condition="'$(Platform)'=='Win32'">$(SdlDir)\lib\i686-w64-mingw32;$(SdlImageDir)\lib\i686-w64-mingw32;$(SdlMixerDir)\lib\i686-w64-mingw32</SdlLibs>
@@ -21 +21 @@
 
     <!-- BulletPhysics -->
-    <BtPhysDir>$(ContribDir)\bullet-2.80-rev2531</BtPhysDir>
+    <BtPhysDir>$(ExternalDir)\bullet-2.80-rev2531</BtPhysDir>
     <BtPhysIncludes>$(BtPhysDir)\include;$(BtPhysDir)\include\bullet</BtPhysIncludes>
     <Win32Defines Condition="'$(UseBullet)'=='true'">HAVE_PHYS_USE_BULLET;$(Win32Defines)</Win32Defines>
@@ -28 +28 @@
 
     <!-- GTK+ & GtkGl -->
-    <GtkDir>$(ContribDir)\gtk-2.22.1</GtkDir>
-    <GtkGlDir>$(ContribDir)\gtkglarea-2.0.1</GtkGlDir>
+    <GtkDir>$(ExternalDir)\gtk-2.22.1</GtkDir>
+    <GtkGlDir>$(ExternalDir)\gtkglarea-2.0.1</GtkGlDir>
     <GtkIncludes>$(GtkDir)\lib\glib-2.0\include;$(GtkDir)\lib\gtk-2.0\include;$(GtkDir)\include\glib-2.0;$(GtkDir)\include\gtk-2.0;$(GtkDir)\include\cairo;$(GtkDir)\include\pango-1.0;$(GtkDir)\include\gdk-pixbuf-2.0;$(GtkDir)\include\atk-1.0;$(GtkGlDir)\include</GtkIncludes>
     <GtkLibs>$(GtkDir)\lib;$(GtkDir)\bin;$(GtkGlDir)\lib</GtkLibs>
@@ -35 +35 @@
 
     <!-- libcaca -->
-    <CacaDir>$(ContribDir)\libcaca-0.99.beta18</CacaDir>
+    <CacaDir>$(ExternalDir)\libcaca-0.99.beta18</CacaDir>
     <CacaIncludes>$(CacaDir)\include</CacaIncludes>
     <CacaLibs Condition="'$(Platform)'=='Win32'">$(CacaDir)\lib\i686-w64-mingw32</CacaLibs>
@@ -47 +47 @@
 
     <!-- OpenGL & GLEW -->
-    <GlewDir>$(ContribDir)\glew-1.7.0</GlewDir>
+    <GlewDir>$(ExternalDir)\glew-1.9.0</GlewDir>
     <GlIncludes>$(GlewDir)\include\GL</GlIncludes>
     <GlLibs Condition="'$(Platform)'=='Win32'">$(GlewDir)\lib\i686-w64-mingw32</GlLibs>
@@ -53 +53 @@
     <GlLibs Condition="'$(Platform)|$(Configuration)'=='PS3|Debug'">$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\debug</GlLibs>
     <GlLibs Condition="'$(Platform)|$(Configuration)'=='PS3|Release'">$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\opt</GlLibs>
-    <GlDeps Condition="'$(Platform)'=='Win32'">opengl32.lib;glew32.lib</GlDeps>
-    <GlDeps Condition="'$(Platform)'=='x64'">opengl32.lib;glew32.lib</GlDeps>
+    <GlDeps Condition="'$(Platform)'=='Win32'">opengl32.lib;glew32s.lib</GlDeps>
+    <GlDeps Condition="'$(Platform)'=='x64'">opengl32.lib;glew32s.lib</GlDeps>
     <GlDeps Condition="'$(Platform)'=='PS3'">libPSGL.a;libgcm_cmd.a;libgcm_sys_stub.a;libcgc.a;libPSGLcgc.a</GlDeps>
     <Win32Defines Condition="'$(UseOpenGL)'=='true'">HAVE_GL_2X;USE_GLEW;GLEW_STATIC;$(Win32Defines)</Win32Defines>
@@ -85 +85 @@
   <ItemDefinitionGroup />
   <ItemGroup>
-    <BuildMacro Include="ContribDir"><Value>$(ContribDir)</Value></BuildMacro>
+    <BuildMacro Include="ExternalDir"><Value>$(ExternalDir)</Value></BuildMacro>
     <BuildMacro Include="FlexDir"><Value>$(FlexDir)</Value></BuildMacro>
     <BuildMacro Include="FlexIncludes"><Value>$(FlexIncludes)</Value></BuildMacro>

trunk/configure.ac

@@ -229 +229 @@
 AC_LANG_POP(C++)
 if test "x${ac_cv_my_have_flexlexer_h}" = "xno"; then
-  LOL_CFLAGS="$LOL_CFLAGS -I\$(top_srcdir)/contrib/flex-2.5.35/include"
+  LOL_CFLAGS="$LOL_CFLAGS -I\$(top_srcdir)/external/flex-2.5.35/include"
 fi
 

trunk/external/NOTES

@@ -1 @@
-#####################
-# Building contribs #
-#####################
+##############################
+# Building external software #
+##############################
 
 
@@ -9 +9 @@
 Download page: http://sourceforge.net/projects/glew/files/glew
 
-- fix config/Makefile.linux-mingw32 and config/Makefile.linux-mingw64 to
-  get the right compiler and linker executable names.
+- take the pre-compiled glew32s.lib ("s" is for "static") versions for
+  both win32 and win64.
 
-    sed -i 's/i586-mingw32msvc/i686-w64-mingw32/g' config/*.linux-mingw32
-    sed -i 's/amd64-mingw32msvc/x86_64-w64-mingw32/g' config/*.linux-mingw64
-
-- fix Makefile for static builds
-
-    sed -i 's/-DGLEW_NO_GLU.*CFLAGS[^P]*CFLAGS/-DGLEW_STATIC &/g' Makefile
-
-- build for Win32
-
-    make SYSTEM=linux-mingw32 clean all
-    i686-w64-mingw32-ranlib lib/libglew32.a
-
-- copy lib/libglew32.a in the contrib directory as glew32.lib
-
-- build for Win64
-
-    make SYSTEM=linux-mingw64 clean all
-    x86_64-w64-mingw32-ranlib lib/libglew32.a
-
-- copy lib/libglew32.a in the contrib directory as glew32.lib
+- copy include/GL/ in the external directory.
 
 

trunk/test

@@ -2 +2 @@
 Makefile.in
 .deps
+*.exe
+*.so
+*.elf
+*.self
+*.nexe
 benchsuite
 btphystest

@@ -2 +2 @@
 Makefile.in
 .deps
+*.exe
+*.so
+*.elf
+*.self
+*.nexe
 benchsuite
 btphystest

trunk/test/math

@@ -2 +2 @@
 Makefile.in
 .deps
+*.exe
+*.so
+*.elf
+*.self
+*.nexe
 remez
 poly

@@ -2 +2 @@
 Makefile.in
 .deps
+*.exe
+*.so
+*.elf
+*.self
+*.nexe
 remez
 poly

trunk/test/sandbox

@@ -1 @@
-.deps
 Makefile
 Makefile.in
+.deps
+*.exe
+*.so
+*.elf
+*.self
+*.nexe
 sample

@@ -1 @@
-.deps
 Makefile
 Makefile.in
+.deps
+*.exe
+*.so
+*.elf
+*.self
+*.nexe
 sample

trunk/test/xolotl

@@ -1 @@
-.deps
 Makefile
 Makefile.in
+.deps
+*.exe
+*.so
+*.elf
+*.self
+*.nexe
 xolotl

@@ -1 @@
-.deps
 Makefile
 Makefile.in
+.deps
+*.exe
+*.so
+*.elf
+*.self
+*.nexe
 xolotl

trunk/tools

@@ -1 @@
-.deps
-make-font
 Makefile
 Makefile.in
+.deps
+*.exe
+*.so
+*.elf
+*.self
+*.nexe
+make-font

@@ -1 @@
-.deps
-make-font
 Makefile
 Makefile.in
+.deps
+*.exe
+*.so
+*.elf
+*.self
+*.nexe
+make-font

trunk/tools/vslol/AssemblyInfo.cs

@@ -21 +21 @@
 [assembly: Guid("58968f91-edb8-4a4c-9f4f-ba39fdb4a21a")]
 
-[assembly: AssemblyVersion("1.0.0.1")]
-[assembly: AssemblyFileVersion("1.0.0.1")]
+[assembly: AssemblyVersion("1.0.0.2")]
+[assembly: AssemblyFileVersion("1.0.0.2")]

trunk/tools/vslol/MenuGenerateCompilers.cs

@@ -104 +104 @@
 
                 /* FIXME: find this using the solution globals! */
-                string contrib_path = project_path;
+                string external_path = project_path;
                 for (int i = 0; i < 10; ++i)
                 {
-                    contrib_path += "\\..";
-                    if (Directory.Exists(contrib_path + "\\contrib"))
+                    external_path += "\\..";
+                    if (Directory.Exists(external_path + "\\external"))
                         break;
                 }
 
                 /* FIXME: do not hardcode shit! */
-                string flex_path = contrib_path + "\\contrib\\flex-2.5.35";
-                string bison_path = contrib_path + "\\contrib\\bison-2.4.2";
+                string flex_path = external_path + "\\external\\flex-2.5.35";
+                string bison_path = external_path + "\\external\\bison-2.4.2";
 
                 // Run flex on all the .l files

trunk/tools/vslol/source.extension.vsixmanifest

@@ -4 +4 @@
     <Name>VsLol</Name>
     <Author>Lol</Author>
-    <Version>1.0.0.1</Version>
+    <Version>1.0.0.2</Version>
     <Description xml:space="preserve">Lol Engine Productivity Tools.</Description>
     <Locale>1033</Locale>

trunk/tutorial

@@ -1 @@
-.deps
 Makefile
 Makefile.in
+.deps
+*.exe
+*.so
+*.elf
+*.self
+*.nexe
 01_triangle
 02_cube

@@ -1 @@
-.deps
 Makefile
 Makefile.in
+.deps
+*.exe
+*.so
+*.elf
+*.self
+*.nexe
 01_triangle
 02_cube

@@ -2 +2 @@
 Makefile.in
 .deps
+*.exe
+*.so
+*.elf
+*.self
+*.nexe
 benchsuite
 btphystest

@@ -2 +2 @@
 Makefile.in
 .deps
+*.exe
+*.so
+*.elf
+*.self
+*.nexe
 remez
 poly

@@ -1 @@
-.deps
 Makefile
 Makefile.in
+.deps
+*.exe
+*.so
+*.elf
+*.self
+*.nexe
 sample

@@ -1 @@
-.deps
 Makefile
 Makefile.in
+.deps
+*.exe
+*.so
+*.elf
+*.self
+*.nexe
 xolotl

@@ -1 @@
-.deps
-make-font
 Makefile
 Makefile.in
+.deps
+*.exe
+*.so
+*.elf
+*.self
+*.nexe
+make-font

@@ -1 @@
-.deps
 Makefile
 Makefile.in
+.deps
+*.exe
+*.so
+*.elf
+*.self
+*.nexe
 01_triangle
 02_cube