Changeset 401 for trunk/src


Ignore:
Timestamp:
06/13/15 18:02:17 (10 years ago)
Author:
epyon
Message:
  • clang/gcc fixes
  • removed aligned array, usage of alignas should work now
Location:
trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/core/time.cc

    r395 r401  
    1717#pragma intrinsic(__rdtsc)
    1818#else
    19 #if NV_COMPILER == NV_GNUC && NV_PLATFORM == NV_WINDOWS
     19#if NV_PLATFORM == NV_WINDOWS
    2020// mingw doesn't have usleep nor nanosleep...
    2121#include <windows.h>
    … …  
    7171        Sleep( ms );
    7272#else
    73 #if NV_COMPILER == NV_GNUC && NV_PLATFORM == NV_WINDOWS
     73#if NV_PLATFORM == NV_WINDOWS
    7474        Sleep( ms );
    7575#else

  • trunk/src/formats/md5_loader.cc

    r399 r401  
    1010#include "nv/stl/vector.hh"
    1111#include "nv/io/std_stream.hh"
     12
     13#include <stdio.h>  // sscanf
     14#include <stdlib.h> // atof
    1215
    1316using namespace nv;

  • trunk/src/gui/gui_environment.cc

    r395 r401  
    99#include "nv/gui/gui_renderer.hh"
    1010
     11#include <algorithm> // std::find on std::list
    1112
    1213        /*
Note: See TracChangeset for help on using the changeset viewer.