Changeset 2540


Ignore:
Timestamp:
Mar 2, 2013, 4:02:57 PM (7 years ago)
Author:
sam
Message:

core: import pristine lua 5.2.1 in the engine code.

Location:
trunk
Files:
62 added
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/build/vs2010/Lol.sln

    r2450 r2540  
    66                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
    77                {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661}
     8                {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4}
    89        EndProjectSection
    910EndProject
     
    1213                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
    1314                {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661}
     15                {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4}
    1416        EndProjectSection
    1517EndProject
     
    1820                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
    1921                {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661}
     22                {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4}
    2023        EndProjectSection
    2124EndProject
     
    2831Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lolbullet", "..\..\src\bullet\lolbullet.vcxproj", "{83D3B207-C601-4025-8F41-01DEDC354661}"
    2932EndProject
     33Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lollua", "..\..\src\lua\lollua.vcxproj", "{D84021CA-B233-4E0F-8A52-071B83BBCCC4}"
     34EndProject
    3035Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{E0491194-35E3-4513-9D31-608EA3165ECF}"
    3136EndProject
     
    3439                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
    3540                {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661}
     41                {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4}
    3642        EndProjectSection
    3743EndProject
     
    4046                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
    4147                {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661}
     48                {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4}
    4249        EndProjectSection
    4350EndProject
     
    4855                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
    4956                {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661}
     57                {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4}
    5058        EndProjectSection
    5159EndProject
     
    5462                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
    5563                {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661}
     64                {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4}
    5665        EndProjectSection
    5766EndProject
     
    6069                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
    6170                {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661}
     71                {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4}
    6272        EndProjectSection
    6373EndProject
     
    6676                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
    6777                {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661}
     78                {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4}
    6879        EndProjectSection
    6980EndProject
     
    7485                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
    7586                {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661}
     87                {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4}
    7688        EndProjectSection
    7789EndProject
     
    255267                {83D3B207-C601-4025-8F41-01DEDC354661}.Release|Xbox 360.Build.0 = Release|Xbox 360
    256268                {83D3B207-C601-4025-8F41-01DEDC354661}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
     269                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|Any CPU.ActiveCfg = Debug|Win32
     270                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
     271                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|Mixed Platforms.Build.0 = Debug|Win32
     272                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|PS3.ActiveCfg = Debug|PS3
     273                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|PS3.Build.0 = Debug|PS3
     274                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|Win32.ActiveCfg = Debug|Win32
     275                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|Win32.Build.0 = Debug|Win32
     276                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|x64.ActiveCfg = Debug|x64
     277                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|x64.Build.0 = Debug|x64
     278                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
     279                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
     280                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
     281                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Any CPU.ActiveCfg = Release|Win32
     282                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Mixed Platforms.ActiveCfg = Release|Win32
     283                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Mixed Platforms.Build.0 = Release|Win32
     284                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|PS3.ActiveCfg = Release|PS3
     285                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|PS3.Build.0 = Release|PS3
     286                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Win32.ActiveCfg = Release|Win32
     287                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Win32.Build.0 = Release|Win32
     288                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|x64.ActiveCfg = Release|x64
     289                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|x64.Build.0 = Release|x64
     290                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
     291                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Xbox 360.Build.0 = Release|Xbox 360
     292                {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
    257293                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Any CPU.ActiveCfg = Debug|Win32
    258294                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
     
    748784                {17F0F184-4436-4D08-B8AA-16572EA238DB} = {2F87CEAB-4818-443C-A5E3-6C34E7D967EC}
    749785                {83D3B207-C601-4025-8F41-01DEDC354661} = {1AFD580B-98B8-4689-B661-38C41132C60E}
     786                {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {1AFD580B-98B8-4689-B661-38C41132C60E}
    750787                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {1AFD580B-98B8-4689-B661-38C41132C60E}
    751788                {B1E10086-A1DA-401A-834D-969C9DBB5CC1} = {E0491194-35E3-4513-9D31-608EA3165ECF}
  • trunk/configure.ac

    r2532 r2540  
    177177LOL_TRY_CXXFLAGS(-Wunused, [AM_CPPFLAGS="${AM_CPPFLAGS} -Wunused"])
    178178LOL_TRY_CXXFLAGS(-Wstrict-aliasing, [AM_CPPFLAGS="${AM_CPPFLAGS} -Wstrict-aliasing"])
    179 LOL_TRY_CXXFLAGS(-Wreorder, [AM_CPPFLAGS="${AM_CPPFLAGS} -Wreorder"])
    180179LOL_TRY_CXXFLAGS(-Wparentheses, [AM_CPPFLAGS="${AM_CPPFLAGS} -Wparentheses"])
     180LOL_TRY_CXXFLAGS(-Wreorder, [AM_CXXFLAGS="${AM_CXXFLAGS} -Wreorder"])
    181181
    182182
     
    405405LOL_CFLAGS="$LOL_CFLAGS $SDL_CFLAGS $GL_CFLAGS $EGL_CFLAGS $LIBPNG_CFLAGS"
    406406LOL_LIBS="$LOL_LIBS $SDL_LIBS $GL_LIBS $EGL_LIBS $LIBPNG_LIBS $D3D_LIBS"
    407 LOL_DEPENDENCIES="${LOL_DEPENDENCIES} \$(top_builddir)/src/liblolcore.a"
    408 LOL_DEPENDENCIES="${LOL_DEPENDENCIES} \$(top_builddir)/src/bullet/liblolbullet.a"
     407LOL_DEPS="${LOL_DEPS} \$(top_builddir)/src/liblolcore.a"
     408LOL_DEPS="${LOL_DEPS} \$(top_builddir)/src/bullet/liblolbullet.a"
     409LOL_DEPS="${LOL_DEPS} \$(top_builddir)/src/lua/liblollua.a"
    409410
    410411dnl  How to use the Lol Engine inside this tree
     
    412413AM_CPPFLAGS="${AM_CPPFLAGS} -DLOL_CONFIG_SOURCESUBDIR=\\\"\$(subdir)\\\""
    413414AM_CPPFLAGS="${AM_CPPFLAGS} ${LOL_CFLAGS}"
    414 AM_LDFLAGS="${AM_LDFLAGS} ${LOL_DEPENDENCIES}"
     415AM_LDFLAGS="${AM_LDFLAGS} ${LOL_DEPS}"
    415416AM_LDFLAGS="${AM_LDFLAGS} ${LOL_LIBS}"
    416417
     
    418419AC_SUBST(LOL_CFLAGS)
    419420AC_SUBST(LOL_LIBS)
    420 AC_SUBST(LOL_DEPENDENCIES)
     421AC_SUBST(LOL_DEPS)
    421422
    422423AC_SUBST(AM_CFLAGS)
     
    431432  src/Makefile
    432433  src/bullet/Makefile
     434  src/lua/Makefile
    433435  src/data/Makefile
    434436  src/data/font/Makefile
  • trunk/src/Makefile.am

    r2524 r2540  
    22include $(top_srcdir)/build/autotools/common.am
    33
    4 SUBDIRS = bullet data
     4SUBDIRS = bullet lua data
    55
    66noinst_LIBRARIES = liblolcore.a
     
    2626    $(d3d9_sources) \
    2727    $(android_sources)
    28 liblolcore_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/bullet
     28liblolcore_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/bullet -I$(srcdir)/lua
    2929
    3030EXTRA_DIST = easymesh/easymesh-scanner.l easymesh/easymesh-parser.y \
  • trunk/src/bullet/lolbullet.vcxproj

    r2386 r2540  
    4141  </PropertyGroup>
    4242  <Import Project="$(SolutionDir)\Lol.Core.Config.props" />
    43   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    44     <UseDebugLibraries>true</UseDebugLibraries>
     43  <PropertyGroup Label="Configuration">
    4544    <CharacterSet>MultiByte</CharacterSet>
    4645  </PropertyGroup>
    47   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     46  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
    4847    <UseDebugLibraries>true</UseDebugLibraries>
    49     <CharacterSet>MultiByte</CharacterSet>
    5048  </PropertyGroup>
    51   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration">
    52     <CharacterSet>MultiByte</CharacterSet>
    53   </PropertyGroup>
    54   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="Configuration">
    55     <CharacterSet>MultiByte</CharacterSet>
    56   </PropertyGroup>
    57   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     49  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
    5850    <UseDebugLibraries>false</UseDebugLibraries>
    5951    <WholeProgramOptimization>true</WholeProgramOptimization>
    60     <CharacterSet>MultiByte</CharacterSet>
    6152  </PropertyGroup>
    62   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    63     <UseDebugLibraries>false</UseDebugLibraries>
    64     <WholeProgramOptimization>true</WholeProgramOptimization>
    65     <CharacterSet>MultiByte</CharacterSet>
    66   </PropertyGroup>
    67   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration">
    68     <WholeProgramOptimization>true</WholeProgramOptimization>
    69     <CharacterSet>MultiByte</CharacterSet>
    70   </PropertyGroup>
    71   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" Label="Configuration">
    72     <WholeProgramOptimization>true</WholeProgramOptimization>
    73     <CharacterSet>MultiByte</CharacterSet>
    74   </PropertyGroup>
    75   <ImportGroup Label="ExtensionSettings">
    76     <Import Project="$(SolutionDir)\Lol.Fx.props" />
    77   </ImportGroup>
    7853  <ImportGroup Label="PropertySheets">
    7954    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  • trunk/src/lolcore.vcxproj

    r2524 r2540  
    284284      <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
    285285    </ProjectReference>
     286    <ProjectReference Include="lua\lollua.vcxproj">
     287      <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
     288    </ProjectReference>
    286289  </ItemGroup>
    287290  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  • trunk/test/Makefile.am

    r2524 r2540  
    2525    unit/rand.cpp
    2626testsuite_CPPFLAGS = $(AM_CPPFLAGS)
    27 testsuite_DEPENDENCIES = @LOL_DEPENDENCIES@
     27testsuite_DEPENDENCIES = @LOL_DEPS@
    2828
    2929benchsuite_SOURCES = benchsuite.cpp \
     
    3131    benchmark/real.cpp
    3232benchsuite_CPPFLAGS = $(AM_CPPFLAGS)
    33 benchsuite_DEPENDENCIES = @LOL_DEPENDENCIES@
     33benchsuite_DEPENDENCIES = @LOL_DEPS@
    3434
    3535btphystest_SOURCES = \
     
    4242btphystest_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/bullet \
    4343    -DHAVE_PHYS_USE_BULLET
    44 btphystest_DEPENDENCIES = @LOL_DEPENDENCIES@
     44btphystest_DEPENDENCIES = @LOL_DEPS@
    4545
    4646meshviewer_SOURCES = meshviewer.cpp \
    4747    shinymvtexture.lolfx shinyfur.lolfx
    4848meshviewer_CPPFLAGS = $(AM_CPPFLAGS)
    49 meshviewer_DEPENDENCIES = @LOL_DEPENDENCIES@
     49meshviewer_DEPENDENCIES = @LOL_DEPS@
    5050
  • trunk/test/math/Makefile.am

    r2397 r2540  
    88pi_SOURCES = pi.cpp
    99pi_CPPFLAGS = $(AM_CPPFLAGS)
    10 pi_DEPENDENCIES = @LOL_DEPENDENCIES@
     10pi_DEPENDENCIES = @LOL_DEPS@
    1111
    1212poly_SOURCES = poly.cpp
    1313poly_CPPFLAGS = $(AM_CPPFLAGS)
    14 poly_DEPENDENCIES = @LOL_DEPENDENCIES@
     14poly_DEPENDENCIES = @LOL_DEPS@
    1515
    1616remez_SOURCES = remez.cpp
    1717remez_CPPFLAGS = $(AM_CPPFLAGS)
    18 remez_DEPENDENCIES = @LOL_DEPENDENCIES@
     18remez_DEPENDENCIES = @LOL_DEPS@
    1919
  • trunk/test/sandbox/Makefile.am

    r2397 r2540  
    66sample_SOURCES = sample.cpp
    77sample_CPPFLAGS = $(AM_CPPFLAGS)
    8 sample_DEPENDENCIES = @LOL_DEPENDENCIES@
     8sample_DEPENDENCIES = @LOL_DEPS@
    99
  • trunk/test/xolotl/Makefile.am

    r2397 r2540  
    66xolotl_SOURCES = xolotl.cpp xolotl.h
    77xolotl_CPPFLAGS = $(AM_CPPFLAGS)
    8 xolotl_DEPENDENCIES = @LOL_DEPENDENCIES@
     8xolotl_DEPENDENCIES = @LOL_DEPS@
    99
  • trunk/tools/neercs/Makefile.am

    r2397 r2540  
    2323neercs_CPPFLAGS = $(AM_CPPFLAGS) @CACA_CFLAGS@ -Iold
    2424neercs_LDFLAGS = $(AM_LDFLAGS) @CACA_LIBS@ @UTIL_LIBS@ @PAM_LIBS@
    25 neercs_DEPENDENCIES = @LOL_DEPENDENCIES@
     25neercs_DEPENDENCIES = @LOL_DEPS@
    2626
    2727old_sources = \
  • trunk/tutorial/Makefile.am

    r2397 r2540  
    7701_triangle_SOURCES = 01_triangle.cpp 01_triangle.lolfx
    8801_triangle_CPPFLAGS = $(AM_CPPFLAGS)
    9 01_triangle_DEPENDENCIES = @LOL_DEPENDENCIES@
     901_triangle_DEPENDENCIES = @LOL_DEPS@
    1010
    111102_cube_SOURCES = 02_cube.cpp 02_cube.lolfx
    121202_cube_CPPFLAGS = $(AM_CPPFLAGS)
    13 02_cube_DEPENDENCIES = @LOL_DEPENDENCIES@
     1302_cube_DEPENDENCIES = @LOL_DEPS@
    1414
    151503_noise_SOURCES = 03_noise.cpp 03_noise.lolfx
    161603_noise_CPPFLAGS = $(AM_CPPFLAGS)
    17 03_noise_DEPENDENCIES = @LOL_DEPENDENCIES@
     1703_noise_DEPENDENCIES = @LOL_DEPS@
    1818
    191904_texture_SOURCES = 04_texture.cpp 04_texture.lolfx
    202004_texture_CPPFLAGS = $(AM_CPPFLAGS)
    21 04_texture_DEPENDENCIES = @LOL_DEPENDENCIES@
     2104_texture_DEPENDENCIES = @LOL_DEPS@
    2222
    232305_easymesh_SOURCES = 05_easymesh.cpp
    242405_easymesh_CPPFLAGS = $(AM_CPPFLAGS)
    25 05_easymesh_DEPENDENCIES = @LOL_DEPENDENCIES@
     2505_easymesh_DEPENDENCIES = @LOL_DEPS@
    2626
    272708_fbo_SOURCES = 08_fbo.cpp 08_fbo.lolfx
    282808_fbo_CPPFLAGS = $(AM_CPPFLAGS)
    29 08_fbo_DEPENDENCIES = @LOL_DEPENDENCIES@
     2908_fbo_DEPENDENCIES = @LOL_DEPS@
    3030
    313111_fractal_SOURCES = 11_fractal.cpp 11_fractal.lolfx
    323211_fractal_CPPFLAGS = $(AM_CPPFLAGS)
    33 11_fractal_DEPENDENCIES = @LOL_DEPENDENCIES@
     3311_fractal_DEPENDENCIES = @LOL_DEPS@
    3434
Note: See TracChangeset for help on using the changeset viewer.