Changeset 1995


Ignore:
Timestamp:
Oct 9, 2012, 12:34:40 PM (5 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:
11 added
2 deleted
19 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/.gitignore

    r1982 r1995  
    5757build/vs2010/*.log
    5858build/vs2010/*.XGD
    59 # Do not exclude anything in contrib. There is no way to do this recursively
     59# Do not exclude anything in external. There is no way to do this recursively
    6060# but the nesting below is currently one level more than our current max.
    61 !contrib/*
    62 !contrib/*/*
    63 !contrib/*/*/*
    64 !contrib/*/*/*/*
    65 !contrib/*/*/*/*/*
    66 !contrib/*/*/*/*/*/*
    67 !contrib/*/*/*/*/*/*/*
     61!external/*
     62!external/*/*
     63!external/*/*/*
     64!external/*/*/*/*
     65!external/*/*/*/*/*
     66!external/*/*/*/*/*/*
     67!external/*/*/*/*/*/*/*
    6868# Our binaries
    6969test/benchsuite
  • trunk/build/autotools/m4

    • Property svn:ignore set to
      ltsugar.m4
      libtool.m4
      ltversion.m4
      lt~obsolete.m4
      ltoptions.m4
  • trunk/build/autotools/m4/lol-gl.m4

    r1982 r1995  
    101101AC_CHECK_HEADER(glew.h,
    102102 [LIBS_save="${LIBS}"
    103   LIBS="${LIBS} -lglew32 ${GL_LIBS}"
    104   AC_MSG_CHECKING(for glewInit in -lglew32)
     103  LIBS="${LIBS} -lglew32s ${GL_LIBS}"
     104  AC_MSG_CHECKING(for glewInit in -lglew32s)
    105105  AC_TRY_LINK(
    106106   [#include <glew.h>],
    107107   [glewInit();],
    108108   [ac_cv_my_have_glew="yes"
    109     GL_LIBS="-lglew32 ${GL_LIBS}"
     109    GL_LIBS="-lglew32s ${GL_LIBS}"
    110110    AC_MSG_RESULT(yes)],
    111111   [AC_MSG_RESULT(no)])
  • trunk/build/check-source.sh

    r1909 r1995  
    9292    case "$file" in
    9393      # These files aren't ours, don't fix
    94       src/bullet/*|contrib/*|*/generated/*|web/plugins/*)
     94      src/bullet/*|external/*|*/generated/*|web/plugins/*)
    9595          :
    9696          ;;
  • trunk/build/lol-build

    r1965 r1995  
    8181    case "${MSYSTEM}" in
    8282        MINGW32|MINGW64)
    83             PATH="$PATH:./contrib/gtk-2.22.1/bin"
    84             M4PATH="$M4PATH:./contrib/gtk-2.22.1/share/aclocal"
     83            PATH="$PATH:./external/gtk-2.22.1/bin"
     84            M4PATH="$M4PATH:./external/gtk-2.22.1/share/aclocal"
    8585            ;;
    8686    esac
     
    121121                BUILDFLAGS=
    122122            fi
    123             PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/gtkglarea-2.0.1/lib/pkgconfig"
    124             PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/libcaca-0.99.beta18/lib/pkgconfig"
    125             LDFLAGS="$LDFLAGS -L$PWD/contrib/glew-1.7.0/lib/i686-w64-mingw32"
    126             LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.15/lib/i686-w64-mingw32"
    127             LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-image-1.2.10/lib/i686-w64-mingw32"
    128             LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-mixer-1.2.11/lib/i686-w64-mingw32"
    129             LDFLAGS="$LDFLAGS -L$PWD/contrib/gtk-2.22.1/lib"
    130             LDFLAGS="$LDFLAGS -L$PWD/contrib/gtk-2.22.1/bin"
    131             LDFLAGS="$LDFLAGS -L$PWD/contrib/gtkglarea-2.0.1/lib"
    132             LDFLAGS="$LDFLAGS -L$PWD/contrib/libcaca-0.99.beta18/lib/i686-w64-mingw32"
     123            PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/external/gtkglarea-2.0.1/lib/pkgconfig"
     124            PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/external/libcaca-0.99.beta18/lib/pkgconfig"
     125            LDFLAGS="$LDFLAGS -L$PWD/external/glew-1.9.0/lib/i686-w64-mingw32"
     126            LDFLAGS="$LDFLAGS -L$PWD/external/sdl-1.2.15/lib/i686-w64-mingw32"
     127            LDFLAGS="$LDFLAGS -L$PWD/external/sdl-image-1.2.10/lib/i686-w64-mingw32"
     128            LDFLAGS="$LDFLAGS -L$PWD/external/sdl-mixer-1.2.11/lib/i686-w64-mingw32"
     129            LDFLAGS="$LDFLAGS -L$PWD/external/gtk-2.22.1/lib"
     130            LDFLAGS="$LDFLAGS -L$PWD/external/gtk-2.22.1/bin"
     131            LDFLAGS="$LDFLAGS -L$PWD/external/gtkglarea-2.0.1/lib"
     132            LDFLAGS="$LDFLAGS -L$PWD/external/libcaca-0.99.beta18/lib/i686-w64-mingw32"
    133133            ;;
    134134        win*-amd64)
     
    146146                BUILDFLAGS=
    147147            fi
    148             PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/gtkglarea-2.0.1/lib/pkgconfig"
    149             PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/libcaca-0.99.beta18/lib/pkgconfig"
    150             LDFLAGS="$LDFLAGS -L$PWD/contrib/glew-1.7.0/lib/x86_64-w64-mingw32"
    151             LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.15/lib/x86_64-w64-mingw32"
    152             LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-image-1.2.10/lib/x86_64-w64-mingw32"
    153             LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-mixer-1.2.11/lib/x86_64-w64-mingw32"
    154             LDFLAGS="$LDFLAGS -L$PWD/contrib/libcaca-0.99.beta18/lib/x86_64-w64-mingw32"
     148            PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/external/gtkglarea-2.0.1/lib/pkgconfig"
     149            PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/external/libcaca-0.99.beta18/lib/pkgconfig"
     150            LDFLAGS="$LDFLAGS -L$PWD/external/glew-1.9.0/lib/x86_64-w64-mingw32"
     151            LDFLAGS="$LDFLAGS -L$PWD/external/sdl-1.2.15/lib/x86_64-w64-mingw32"
     152            LDFLAGS="$LDFLAGS -L$PWD/external/sdl-image-1.2.10/lib/x86_64-w64-mingw32"
     153            LDFLAGS="$LDFLAGS -L$PWD/external/sdl-mixer-1.2.11/lib/x86_64-w64-mingw32"
     154            LDFLAGS="$LDFLAGS -L$PWD/external/libcaca-0.99.beta18/lib/x86_64-w64-mingw32"
    155155            ;;
    156156        *-i386)
     
    191191            ;;
    192192        win*-i386|win*-amd64)
    193             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-1.2.15/include"
    194             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-image-1.2.10/include"
    195             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-mixer-1.2.11/include"
    196             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/glew-1.7.0/include/GL -DGLEW_STATIC"
    197             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/lib/glib-2.0/include"
    198             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/lib/gtk-2.0/include"
    199             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/include/glib-2.0"
    200             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/include/gtk-2.0"
    201             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/include/cairo"
    202             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/include/pango-1.0"
    203             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/include/gdk-pixbuf-2.0"
    204             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/include/atk-1.0"
    205             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtkglarea-2.0.1/include"
     193            CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-1.2.15/include"
     194            CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-image-1.2.10/include"
     195            CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-mixer-1.2.11/include"
     196            CPPFLAGS="$CPPFLAGS -I$PWD/external/glew-1.9.0/include/GL -DGLEW_STATIC"
     197            CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/lib/glib-2.0/include"
     198            CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/lib/gtk-2.0/include"
     199            CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/include/glib-2.0"
     200            CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/include/gtk-2.0"
     201            CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/include/cairo"
     202            CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/include/pango-1.0"
     203            CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/include/gdk-pixbuf-2.0"
     204            CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/include/atk-1.0"
     205            CPPFLAGS="$CPPFLAGS -I$PWD/external/gtkglarea-2.0.1/include"
    206206            CPPFLAGS="$CPPFLAGS -mms-bitfields"
    207207            LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++"
     
    210210            GTK_LIBS="$GTK_LIBS -lglib-2.0 -lgthread-2.0 -lgobject-2.0"
    211211
    212             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/libcaca-0.99.beta18/include -DCACA_STATIC"
     212            CPPFLAGS="$CPPFLAGS -I$PWD/external/libcaca-0.99.beta18/include -DCACA_STATIC"
    213213
    214214            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

    r1822 r1995  
    33  <ImportGroup Label="PropertySheets" />
    44  <PropertyGroup Label="UserMacros">
    5     <ContribDir>$(SolutionDir)\..\..\contrib</ContribDir>
     5    <ExternalDir>$(SolutionDir)\..\..\external</ExternalDir>
    66
    77    <!-- Flex & Bison -->
    8     <FlexDir>$(ContribDir)\flex-2.5.35</FlexDir>
     8    <FlexDir>$(ExternalDir)\flex-2.5.35</FlexDir>
    99    <FlexIncludes>$(FlexDir)\include</FlexIncludes>
    1010
    1111    <!-- SDL -->
    12     <SdlDir>$(ContribDir)\sdl-1.2.15</SdlDir>
    13     <SdlImageDir>$(ContribDir)\sdl-image-1.2.10</SdlImageDir>
    14     <SdlMixerDir>$(ContribDir)\sdl-mixer-1.2.11</SdlMixerDir>
     12    <SdlDir>$(ExternalDir)\sdl-1.2.15</SdlDir>
     13    <SdlImageDir>$(ExternalDir)\sdl-image-1.2.10</SdlImageDir>
     14    <SdlMixerDir>$(ExternalDir)\sdl-mixer-1.2.11</SdlMixerDir>
    1515    <SdlIncludes>$(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include</SdlIncludes>
    1616    <SdlLibs Condition="'$(Platform)'=='Win32'">$(SdlDir)\lib\i686-w64-mingw32;$(SdlImageDir)\lib\i686-w64-mingw32;$(SdlMixerDir)\lib\i686-w64-mingw32</SdlLibs>
     
    2121
    2222    <!-- BulletPhysics -->
    23     <BtPhysDir>$(ContribDir)\bullet-2.80-rev2531</BtPhysDir>
     23    <BtPhysDir>$(ExternalDir)\bullet-2.80-rev2531</BtPhysDir>
    2424    <BtPhysIncludes>$(BtPhysDir)\include;$(BtPhysDir)\include\bullet</BtPhysIncludes>
    2525    <Win32Defines Condition="'$(UseBullet)'=='true'">HAVE_PHYS_USE_BULLET;$(Win32Defines)</Win32Defines>
     
    2828
    2929    <!-- GTK+ & GtkGl -->
    30     <GtkDir>$(ContribDir)\gtk-2.22.1</GtkDir>
    31     <GtkGlDir>$(ContribDir)\gtkglarea-2.0.1</GtkGlDir>
     30    <GtkDir>$(ExternalDir)\gtk-2.22.1</GtkDir>
     31    <GtkGlDir>$(ExternalDir)\gtkglarea-2.0.1</GtkGlDir>
    3232    <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>
    3333    <GtkLibs>$(GtkDir)\lib;$(GtkDir)\bin;$(GtkGlDir)\lib</GtkLibs>
     
    3535
    3636    <!-- libcaca -->
    37     <CacaDir>$(ContribDir)\libcaca-0.99.beta18</CacaDir>
     37    <CacaDir>$(ExternalDir)\libcaca-0.99.beta18</CacaDir>
    3838    <CacaIncludes>$(CacaDir)\include</CacaIncludes>
    3939    <CacaLibs Condition="'$(Platform)'=='Win32'">$(CacaDir)\lib\i686-w64-mingw32</CacaLibs>
     
    4747
    4848    <!-- OpenGL & GLEW -->
    49     <GlewDir>$(ContribDir)\glew-1.7.0</GlewDir>
     49    <GlewDir>$(ExternalDir)\glew-1.9.0</GlewDir>
    5050    <GlIncludes>$(GlewDir)\include\GL</GlIncludes>
    5151    <GlLibs Condition="'$(Platform)'=='Win32'">$(GlewDir)\lib\i686-w64-mingw32</GlLibs>
     
    5353    <GlLibs Condition="'$(Platform)|$(Configuration)'=='PS3|Debug'">$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\debug</GlLibs>
    5454    <GlLibs Condition="'$(Platform)|$(Configuration)'=='PS3|Release'">$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\opt</GlLibs>
    55     <GlDeps Condition="'$(Platform)'=='Win32'">opengl32.lib;glew32.lib</GlDeps>
    56     <GlDeps Condition="'$(Platform)'=='x64'">opengl32.lib;glew32.lib</GlDeps>
     55    <GlDeps Condition="'$(Platform)'=='Win32'">opengl32.lib;glew32s.lib</GlDeps>
     56    <GlDeps Condition="'$(Platform)'=='x64'">opengl32.lib;glew32s.lib</GlDeps>
    5757    <GlDeps Condition="'$(Platform)'=='PS3'">libPSGL.a;libgcm_cmd.a;libgcm_sys_stub.a;libcgc.a;libPSGLcgc.a</GlDeps>
    5858    <Win32Defines Condition="'$(UseOpenGL)'=='true'">HAVE_GL_2X;USE_GLEW;GLEW_STATIC;$(Win32Defines)</Win32Defines>
     
    8585  <ItemDefinitionGroup />
    8686  <ItemGroup>
    87     <BuildMacro Include="ContribDir"><Value>$(ContribDir)</Value></BuildMacro>
     87    <BuildMacro Include="ExternalDir"><Value>$(ExternalDir)</Value></BuildMacro>
    8888    <BuildMacro Include="FlexDir"><Value>$(FlexDir)</Value></BuildMacro>
    8989    <BuildMacro Include="FlexIncludes"><Value>$(FlexIncludes)</Value></BuildMacro>
  • trunk/configure.ac

    r1984 r1995  
    229229AC_LANG_POP(C++)
    230230if test "x${ac_cv_my_have_flexlexer_h}" = "xno"; then
    231   LOL_CFLAGS="$LOL_CFLAGS -I\$(top_srcdir)/contrib/flex-2.5.35/include"
     231  LOL_CFLAGS="$LOL_CFLAGS -I\$(top_srcdir)/external/flex-2.5.35/include"
    232232fi
    233233
  • trunk/external/NOTES

    r1933 r1995  
    1 #####################
    2 # Building contribs #
    3 #####################
     1##############################
     2# Building external software #
     3##############################
    44
    55
     
    99Download page: http://sourceforge.net/projects/glew/files/glew
    1010
    11 - fix config/Makefile.linux-mingw32 and config/Makefile.linux-mingw64 to
    12   get the right compiler and linker executable names.
     11- take the pre-compiled glew32s.lib ("s" is for "static") versions for
     12  both win32 and win64.
    1313
    14     sed -i 's/i586-mingw32msvc/i686-w64-mingw32/g' config/*.linux-mingw32
    15     sed -i 's/amd64-mingw32msvc/x86_64-w64-mingw32/g' config/*.linux-mingw64
    16 
    17 - fix Makefile for static builds
    18 
    19     sed -i 's/-DGLEW_NO_GLU.*CFLAGS[^P]*CFLAGS/-DGLEW_STATIC &/g' Makefile
    20 
    21 - build for Win32
    22 
    23     make SYSTEM=linux-mingw32 clean all
    24     i686-w64-mingw32-ranlib lib/libglew32.a
    25 
    26 - copy lib/libglew32.a in the contrib directory as glew32.lib
    27 
    28 - build for Win64
    29 
    30     make SYSTEM=linux-mingw64 clean all
    31     x86_64-w64-mingw32-ranlib lib/libglew32.a
    32 
    33 - copy lib/libglew32.a in the contrib directory as glew32.lib
     14- copy include/GL/ in the external directory.
    3415
    3516
  • trunk/test

    • Property svn:ignore
      •  

        old new  
        22Makefile.in
        33.deps
         4*.exe
         5*.so
         6*.elf
         7*.self
         8*.nexe
        49benchsuite
        510btphystest
  • trunk/test/math

    • Property svn:ignore
      •  

        old new  
        22Makefile.in
        33.deps
         4*.exe
         5*.so
         6*.elf
         7*.self
         8*.nexe
        49remez
        510poly
  • trunk/test/sandbox

    • Property svn:ignore
      •  

        old new  
        1 .deps
        21Makefile
        32Makefile.in
         3.deps
         4*.exe
         5*.so
         6*.elf
         7*.self
         8*.nexe
        49sample
  • trunk/test/xolotl

    • Property svn:ignore
      •  

        old new  
        1 .deps
        21Makefile
        32Makefile.in
         3.deps
         4*.exe
         5*.so
         6*.elf
         7*.self
         8*.nexe
        49xolotl
  • trunk/tools

    • Property svn:ignore
      •  

        old new  
        1 .deps
        2 make-font
        31Makefile
        42Makefile.in
         3.deps
         4*.exe
         5*.so
         6*.elf
         7*.self
         8*.nexe
         9make-font
  • trunk/tools/neercs/term

    • Property svn:ignore set to
      .deps
      .dirstamp
      Makefile
      Makefile.in
  • trunk/tools/vslol

    • Property svn:ignore set to
      Makefile
      Makefile.in
  • trunk/tools/vslol/AssemblyInfo.cs

    r1936 r1995  
    2121[assembly: Guid("58968f91-edb8-4a4c-9f4f-ba39fdb4a21a")]
    2222
    23 [assembly: AssemblyVersion("1.0.0.1")]
    24 [assembly: AssemblyFileVersion("1.0.0.1")]
     23[assembly: AssemblyVersion("1.0.0.2")]
     24[assembly: AssemblyFileVersion("1.0.0.2")]
  • trunk/tools/vslol/MenuGenerateCompilers.cs

    r1936 r1995  
    104104
    105105                /* FIXME: find this using the solution globals! */
    106                 string contrib_path = project_path;
     106                string external_path = project_path;
    107107                for (int i = 0; i < 10; ++i)
    108108                {
    109                     contrib_path += "\\..";
    110                     if (Directory.Exists(contrib_path + "\\contrib"))
     109                    external_path += "\\..";
     110                    if (Directory.Exists(external_path + "\\external"))
    111111                        break;
    112112                }
    113113
    114114                /* FIXME: do not hardcode shit! */
    115                 string flex_path = contrib_path + "\\contrib\\flex-2.5.35";
    116                 string bison_path = contrib_path + "\\contrib\\bison-2.4.2";
     115                string flex_path = external_path + "\\external\\flex-2.5.35";
     116                string bison_path = external_path + "\\external\\bison-2.4.2";
    117117
    118118                // Run flex on all the .l files
  • trunk/tools/vslol/source.extension.vsixmanifest

    r1936 r1995  
    44    <Name>VsLol</Name>
    55    <Author>Lol</Author>
    6     <Version>1.0.0.1</Version>
     6    <Version>1.0.0.2</Version>
    77    <Description xml:space="preserve">Lol Engine Productivity Tools.</Description>
    88    <Locale>1033</Locale>
  • trunk/tutorial

    • Property svn:ignore
      •  

        old new  
        1 .deps
        21Makefile
        32Makefile.in
         3.deps
         4*.exe
         5*.so
         6*.elf
         7*.self
         8*.nexe
        4901_triangle
        51002_cube
Note: See TracChangeset for help on using the changeset viewer.