Changeset 1457


Ignore:
Timestamp:
Jun 11, 2012, 11:43:21 PM (11 years ago)
Author:
sam
Message:

neercs: fix Win32 build.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/neercs/neercs.vcxproj

    r1451 r1457  
    3636  </ItemGroup>
    3737  <ItemGroup>
    38     <LolFxCompile Include="video\test.lolfx" />
    39   </ItemGroup>
    40   <ItemGroup>
    4138    <ProjectReference Include="$(SolutionDir)lolcore.vcxproj">
    4239      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
    4340    </ProjectReference>
     41  </ItemGroup>
     42  <ItemGroup>
     43    <LolFxCompile Include="video\blurh.lolfx" />
     44    <LolFxCompile Include="video\blurv.lolfx" />
     45    <LolFxCompile Include="video\glow.lolfx" />
     46    <LolFxCompile Include="video\postfx.lolfx" />
     47    <LolFxCompile Include="video\radial.lolfx" />
     48    <LolFxCompile Include="video\simple.lolfx" />
    4449  </ItemGroup>
    4550  <PropertyGroup Label="Globals">

  • trunk/neercs/neercs.vcxproj.filters

    r1451 r1457  
    1919  </ItemGroup>
    2020  <ItemGroup>
    21     <LolFxCompile Include="video\test.lolfx">
     21    <LolFxCompile Include="video\blurh.lolfx">
     22      <Filter>video</Filter>
     23    </LolFxCompile>
     24    <LolFxCompile Include="video\blurv.lolfx">
     25      <Filter>video</Filter>
     26    </LolFxCompile>
     27    <LolFxCompile Include="video\glow.lolfx">
     28      <Filter>video</Filter>
     29    </LolFxCompile>
     30    <LolFxCompile Include="video\postfx.lolfx">
     31      <Filter>video</Filter>
     32    </LolFxCompile>
     33    <LolFxCompile Include="video\radial.lolfx">
     34      <Filter>video</Filter>
     35    </LolFxCompile>
     36    <LolFxCompile Include="video\simple.lolfx">
    2237      <Filter>video</Filter>
    2338    </LolFxCompile>

  • trunk/neercs/video/render.cpp

    r1456 r1457  
    456456        // timer
    457457        timer_global_previous=timer_global;
    458         timer_global=timer->Get();
     458        timer_global+=timer->Get();
    459459        if(!pause) main_angle=timer_global*100.0f*PID;
    460460        timer_fps=1.0f/(timer_global-timer_global_previous);

  • trunk/win32/Lol.Core.Build.props

    r1448 r1457  
    88
    99    <!-- Use OpenGL instead of Direct3D? -->
    10     <UseOpenGL>false</UseOpenGL>
     10    <UseOpenGL>true</UseOpenGL>
    1111
    1212  </PropertyGroup>

  • trunk/win32/lolcore.vcxproj

    r1451 r1457  
    8787    <ClCompile Include="..\src\font.cpp" />
    8888    <ClCompile Include="..\src\forge.cpp" />
     89    <ClCompile Include="..\src\gpu\framebuffer.cpp" />
    8990    <ClCompile Include="..\src\gpu\indexbuffer.cpp" />
    9091    <ClCompile Include="..\src\gpu\shader.cpp" />
    … …  
    146147    <ClInclude Include="..\src\font.h" />
    147148    <ClInclude Include="..\src\forge.h" />
     149    <ClInclude Include="..\src\gpu\framebuffer.h" />
    148150    <ClInclude Include="..\src\gpu\indexbuffer.h" />
    149151    <ClInclude Include="..\src\gpu\shader.h" />

  • trunk/win32/lolcore.vcxproj.filters

    r1406 r1457  
    215215      <Filter>src\...</Filter>
    216216    </ClCompile>
     217    <ClCompile Include="..\src\gpu\framebuffer.cpp">
     218      <Filter>src\gpu</Filter>
     219    </ClCompile>
    217220  </ItemGroup>
    218221  <ItemGroup>
    … …  
    400403      <Filter>src\...</Filter>
    401404    </ClInclude>
     405    <ClInclude Include="..\src\gpu\framebuffer.h">
     406      <Filter>src\gpu</Filter>
     407    </ClInclude>
    402408  </ItemGroup>
    403409  <ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.