build: upgrade glew binaries to 1.9.0 and rename the contrib directory

to external so as to avoid some autocompletion collisions with "configure".

.gitignore

@@ -56,15 +56,15 @@ build/vs2010/*.sdf
 build/vs2010/*.suo
 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
 test/btphystest

build/autotools/m4/lol-gl.m4

@@ -100,13 +100,13 @@ PKG_CHECK_MODULES(GLEW, glew,
  [:])
 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)])
   LIBS="${LIBS_save}"])

build/check-source.sh

@@ -91,7 +91,7 @@ total_errors=0
 for file in $FILES; do
     case "$file" in
       # These files aren't ours, don't fix
-      src/bullet/*|contrib/*|*/generated/*|web/plugins/*)
+      src/bullet/*|external/*|*/generated/*|web/plugins/*)
           :
           ;;
       # Don't harass these people

build/lol-build

@@ -80,8 +80,8 @@ __init__()
 
     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
 }
@@ -120,16 +120,16 @@ configure()
                 # If using mingw64, we're not really cross-compiling
                 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)
             if test "x${MSYSTEM}" = xMINGW64; then
@@ -145,13 +145,13 @@ configure()
                 # If using mingw32, we're not really cross-compiling
                 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)
             # Ensure we're _really_ on i386
@@ -190,26 +190,26 @@ configure()
             PATH="$PATH" ./configure CXX=ppu-lv2-g++ CC=ppu-lv2-gcc ac_cv_exeext=.elf --host=powerpc
             ;;
         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++"
             GTK_LIBS="$GTK_LIBS -lgtkgl-2.0 -lopengl32 -lglew32 -lgdi32"
             GTK_LIBS="$GTK_LIBS -lgtk-win32-2.0 -lgdk-win32-2.0"
             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"
             ;;

build/vs2010/Lol.Core.Vars.props

@@ -2,16 +2,16 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <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>
     <SdlLibs Condition="'$(Platform)'=='x64'">$(SdlDir)\lib\x86_64-msvc</SdlLibs>
@@ -20,21 +20,21 @@
     <Win32Defines>HAVE_SDL_H;USE_SDL;$(Win32Defines)</Win32Defines>
 
     <!-- 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>
     <Ps3Defines Condition="'$(UseBullet)'=='true'">HAVE_PHYS_USE_BULLET;$(Ps3Defines)</Ps3Defines>
     <XboxDefines Condition="'$(UseBullet)'=='true'">HAVE_PHYS_USE_BULLET;$(XboxDefines)</XboxDefines>
 
     <!-- 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>
     <GtkDeps>gobject-2.0.lib;gthread-2.0.lib;glib-2.0.lib;gdk-win32-2.0.lib;gtk-win32-2.0.lib;gtkgl-2.0.lib</GtkDeps>
 
     <!-- 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>
     <CacaLibs Condition="'$(Platform)'=='x64'">$(CacaDir)\lib\x86_64-w64-mingw32</CacaLibs>
@@ -46,14 +46,14 @@
     <Win32Defines>USE_GDIPLUS;$(Win32Defines)</Win32Defines>
 
     <!-- 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>
     <GlLibs Condition="'$(Platform)'=='x64'">$(GlewDir)\lib\x86_64-w64-mingw32</GlLibs>
     <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>
     <Ps3Defines>HAVE_GLES_2X;$(Ps3Defines)</Ps3Defines>
@@ -84,7 +84,7 @@
   <PropertyGroup />
   <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>
     <BuildMacro Include="SdlDir"><Value>$(SdlDir)</Value></BuildMacro>

configure.ac

@@ -228,7 +228,7 @@ AC_LANG_PUSH(C++)
 AC_CHECK_HEADERS(FlexLexer.h, [ac_cv_my_have_flexlexer_h="yes"])
 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
 
 

tools/vslol/AssemblyInfo.cs

@@ -20,5 +20,5 @@ using System.Runtime.InteropServices;
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [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")]

tools/vslol/MenuGenerateCompilers.cs

@@ -103,17 +103,17 @@ namespace Lol.VisualStudio.Plugin
                 string project_path = Path.GetDirectoryName(project.FullName);
 
                 /* 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
                 foreach (ProjectItem item in ParseProjectItems(project))

tools/vslol/source.extension.vsixmanifest

@@ -3,7 +3,7 @@
   <Identifier Id="VsLol.Sample">
     <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>
     <InstalledByMsi>false</InstalledByMsi>