Changeset 1520


Ignore:
Timestamp:
Jun 24, 2012, 4:03:14 PM (7 years ago)
Author:
sam
Message:

build: fix the VS2010 build and add build/ and binaries/ to the dist
tarball.

Location:
trunk
Files:
3 added
21 edited

Legend:

Unmodified
Added
Removed
  • trunk/.gitignore

    r1518 r1520  
    4343# Visual Studio cruft
    4444*.vcxproj.user
     45binaries/*Debug
     46binaries/*Release
    4547build/vs2010/ipch
    46 build/vs2010/*Debug
    47 build/vs2010/*Release
    4848build/vs2010/*.opensdf
    4949build/vs2010/*.sdf
     
    5151build/vs2010/*.log
    5252build/vs2010/*.XGD
    53 # Do not exclude anything in contrib; this is currently one level
    54 # more than our current max
     53# Do not exclude anything in contrib. There is no way to do this recursively
     54# but the nesting below is currently one level more than our current max.
    5555!contrib/*
    5656!contrib/*/*
  • trunk/Makefile.am

    r1518 r1520  
    66SUBDIRS += orbital
    77SUBDIRS += neercs
    8 DIST_SUBDIRS = $(SUBDIRS)
     8DIST_SUBDIRS = $(SUBDIRS) build binaries
    99
    10 EXTRA_DIST = bootstrap build-linux build-mingw build-mingw64 build-ps3 \
    11              build-nacl32 build-nacl64 build/lol-build
     10EXTRA_DIST = bootstrap TODO
    1211AUTOMAKE_OPTIONS = dist-bzip2
    1312
  • trunk/build/vs2010/Lol.Core.Rules.props

    r1518 r1520  
    1010      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    1111      <FloatingPointModel>Fast</FloatingPointModel>
    12       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(FlexIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     12      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\src;$(FlexIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1313      <AdditionalIncludeDirectories Condition="'$(Platform)'=='Win32'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1414      <AdditionalIncludeDirectories Condition="'$(Platform)'=='x64'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  • trunk/build/vs2010/Lol.Core.Vars.props

    r1518 r1520  
    33  <ImportGroup Label="PropertySheets" />
    44  <PropertyGroup Label="UserMacros">
    5     <ContribDir>$(SolutionDir)\..\contrib</ContribDir>
     5    <ContribDir>$(SolutionDir)\..\..\contrib</ContribDir>
    66
    77    <!-- Flex & Bison -->
     
    9090  </ItemGroup>
    9191  <PropertyGroup>
    92     <OutDir>$(SolutionDir)\$(Platform) $(Configuration)\</OutDir>
    93     <IntDir>$(SolutionDir)\$(Platform) $(Configuration)\$(ProjectName)\</IntDir>
     92    <OutDir>$(SolutionDir)..\..\binaries\$(Platform) $(Configuration)\</OutDir>
     93    <IntDir>$(SolutionDir)..\..\binaries\$(Platform) $(Configuration)\$(ProjectName)\</IntDir>
    9494  </PropertyGroup>
    9595</Project>
  • trunk/configure.ac

    r1518 r1520  
    386386  gfx/font/Makefile
    387387  tools/Makefile
     388  build/Makefile
     389  binaries/Makefile
    388390])
    389391AC_CONFIG_FILES(
  • trunk/deushax/deushax.vcxproj

    r1451 r1520  
    3737  </ItemGroup>
    3838  <ItemGroup>
    39     <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj">
     39    <ProjectReference Include="$(SolutionDir)\..\..\src\lolcore.vcxproj">
    4040      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
    4141    </ProjectReference>
  • trunk/deushax/editor.vcxproj

    r1451 r1520  
    3737  </ItemGroup>
    3838  <ItemGroup>
    39     <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj">
     39    <ProjectReference Include="$(SolutionDir)\..\..\src\lolcore.vcxproj">
    4040      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
    4141    </ProjectReference>
     
    5858  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    5959    <ClCompile>
    60       <AdditionalIncludeDirectories>$(SolutionDir)\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     60      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    6161    </ClCompile>
    6262    <Link>
     
    6767  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    6868    <ClCompile>
    69       <AdditionalIncludeDirectories>$(SolutionDir)\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     69      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    7070    </ClCompile>
    7171    <Link>
     
    7676  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
    7777    <ClCompile>
    78       <AdditionalIncludeDirectories>$(SolutionDir)\..\deushax;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     78      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\deushax;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    7979    </ClCompile>
    8080    <Link>
     
    8383  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    8484    <ClCompile>
    85       <AdditionalIncludeDirectories>$(SolutionDir)\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     85      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8686    </ClCompile>
    8787    <Link>
     
    9292  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    9393    <ClCompile>
    94       <AdditionalIncludeDirectories>$(SolutionDir)\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     94      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\deushax;$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    9595    </ClCompile>
    9696    <Link>
     
    101101  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
    102102    <ClCompile>
    103       <AdditionalIncludeDirectories>$(SolutionDir)\..\deushax;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     103      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\deushax;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    104104    </ClCompile>
    105105    <Link>
  • trunk/monsterz/monsterz.vcxproj

    r1451 r1520  
    4848  </ItemGroup>
    4949  <ItemGroup>
    50     <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj">
     50    <ProjectReference Include="$(SolutionDir)\..\..\src\lolcore.vcxproj">
    5151      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
    5252    </ProjectReference>
  • trunk/mrpigeon/mrpigeon.vcxproj

    r1451 r1520  
    5050  </ItemGroup>
    5151  <ItemGroup>
    52     <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj">
     52    <ProjectReference Include="$(SolutionDir)\..\..\src\lolcore.vcxproj">
    5353      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
    5454    </ProjectReference>
  • trunk/neercs/neercs.vcxproj

    r1499 r1520  
    3838  </ItemGroup>
    3939  <ItemGroup>
    40     <ProjectReference Include="$(SolutionDir)lolcore.vcxproj">
     40    <ProjectReference Include="$(SolutionDir)\..\..\src\lolcore.vcxproj">
    4141      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
    4242    </ProjectReference>
  • trunk/orbital/Lolnament.h

    r1512 r1520  
    218218                        debug_point_angle -= M_PI * 2.0f;
    219219
    220                 //m_influence_point_list << influencing_point_infos(BLD_SPHERE, vec3(cos(debug_point_angle) * DEF_X, 0, sin(debug_point_angle) * DEF_Z) * DEF_SIZE * 0.3f, 1.0f);
    221                 m_influence_point_list << influencing_point_infos(BLD_SQUARE, vec3(-cos(debug_point_angle) * DEF_X, 0, -sin(debug_point_angle) * DEF_Z) * DEF_SIZE * 0.3f, 1.0f);
     220                //m_influence_point_list << influencing_point_infos(BLD_SPHERE, vec3(lol::cos(debug_point_angle) * DEF_X, 0, lol::sin(debug_point_angle) * DEF_Z) * DEF_SIZE * 0.3f, 1.0f);
     221                m_influence_point_list << influencing_point_infos(BLD_SQUARE, vec3(-lol::cos(debug_point_angle) * DEF_X, 0, -lol::sin(debug_point_angle) * DEF_Z) * DEF_SIZE * 0.3f, 1.0f);
    222222
    223223                ComputeInfluenceValues();
     
    337337                        {
    338338                                float point_angle = wave_angle + (float)src_transient.m_point_id * 2.0f * (float)M_PI * 2.0f / ((float)DEF_X * 1.051f);
    339                                 dst_work.m_pos += vec3(0.0f, (-1.0f + cos(point_angle)) * 20.0f, 0.0f);
     339                                dst_work.m_pos += vec3(0.0f, (-1.0f + lol::cos(point_angle)) * 20.0f, 0.0f);
    340340                                //TODO : dst_work.m_rot += vec3(0,0,0);
    341341                        }
  • trunk/orbital/orbital.cpp

    r1512 r1520  
    239239        if (rightleft * rightleft + updown * updown > 0.2f)
    240240        {
    241             float angle = atan2(updown, rightleft);
     241            float angle = lol::atan2(updown, rightleft);
    242242            angle = (int)(angle / ((float)M_PI / 4.f) + 8.5f) * ((float)M_PI / 4.f);
    243             rightleft = cos(angle);
    244             updown = sin(angle);
     243            rightleft = lol::cos(angle);
     244            updown = lol::sin(angle);
    245245        }
    246246        else
  • trunk/orbital/orbital.vcxproj

    r1510 r1520  
    5050  </ItemGroup>
    5151  <ItemGroup>
    52     <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj">
     52    <ProjectReference Include="$(SolutionDir)\..\..\src\lolcore.vcxproj">
    5353      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
    5454    </ProjectReference>
  • trunk/orbital/player.h

    r1512 r1520  
    9494        if (rightleft * rightleft + updown * updown > 0.2f)
    9595        {
    96             float angle = atan2(updown, rightleft);
     96            float angle = lol::atan2(updown, rightleft);
    9797            angle = (float)((int)(angle / ((float)M_PI / 4.f) + 8.5f) * ((float)M_PI / 4.f));
    98             rightleft = cos(angle);
    99             updown = sin(angle);
     98            rightleft = lol::cos(angle);
     99            updown = lol::sin(angle);
    100100        }
    101101        else
  • trunk/orbital/snake.h

    r1512 r1520  
    9494        }
    9595
    96         float test = sin(m_steer) * 200.f + 60.f;
     96        float test = lol::sin(m_steer) * 200.f + 60.f;
    9797        m_rotation *= quat::rotate(seconds * test, vec3(0, 1, 0));
    9898
     
    167167        {
    168168            pos += m_nodes[i].m1;
    169             y_angle = (180.f / (float)M_PI) * atan2(m_nodes[i].m1.x, m_nodes[i].m1.z);
     169            y_angle = (180.f / (float)M_PI) * lol::atan2(m_nodes[i].m1.x, m_nodes[i].m1.z);
    170170            rot = quat::rotate(y_angle, 0.f, 1.f, 0.f)
    171171                * quat::rotate(m_nodes[i].m2, 0.f, 0.f, 1.f);
    172172            model = mat4::translate(pos) * mat4(rot);
    173173            if (i != m_nodes.Count() - 1 && m_nodes[i].m4)
    174                 m_body.Render(model, sin(2.f * m_nodes[i].m3) * .5f + .5f);
     174                m_body.Render(model, lol::sin(2.f * m_nodes[i].m3) * .5f + .5f);
    175175            else if (i != m_nodes.Count() - 1)
    176176                m_body.Render(model);
  • trunk/test/benchsuite.vcxproj

    r1518 r1520  
    3535  </ItemGroup>
    3636  <ItemGroup>
    37     <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj">
     37    <ProjectReference Include="$(SolutionDir)\..\..\src\lolcore.vcxproj">
    3838      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
    3939    </ProjectReference>
  • trunk/test/debug/quad.vcxproj

    r1518 r1520  
    3131  </ItemGroup>
    3232  <ItemGroup>
    33     <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj">
     33    <ProjectReference Include="$(SolutionDir)\..\..\src\lolcore.vcxproj">
    3434      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
    3535    </ProjectReference>
  • trunk/test/testsuite.vcxproj

    r1518 r1520  
    4242  </ItemGroup>
    4343  <ItemGroup>
    44     <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj">
     44    <ProjectReference Include="$(SolutionDir)\..\..\src\lolcore.vcxproj">
    4545      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
    4646    </ProjectReference>
  • trunk/tutorial/01_triangle.vcxproj

    r1518 r1520  
    3434  </ItemGroup>
    3535  <ItemGroup>
    36     <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj">
     36    <ProjectReference Include="$(SolutionDir)\..\..\src\lolcore.vcxproj">
    3737      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
    3838    </ProjectReference>
  • trunk/tutorial/02_cube.vcxproj

    r1518 r1520  
    3434  </ItemGroup>
    3535  <ItemGroup>
    36     <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj">
     36    <ProjectReference Include="$(SolutionDir)\..\..\src\lolcore.vcxproj">
    3737      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
    3838    </ProjectReference>
  • trunk/tutorial/11_fractal.vcxproj

    r1518 r1520  
    3434  </ItemGroup>
    3535  <ItemGroup>
    36     <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj">
     36    <ProjectReference Include="$(SolutionDir)\..\..\src\lolcore.vcxproj">
    3737      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
    3838    </ProjectReference>
Note: See TracChangeset for help on using the changeset viewer.