Changeset 1146


Ignore:
Timestamp:
Feb 25, 2012, 2:38:49 PM (8 years ago)
Author:
sam
Message:

win32: some compilation fixes here and there.

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/debug/sphere.cpp

    r968 r1146  
    7777    void Normalize(GLfloat *a)
    7878    {
    79         GLfloat d = 1.0f / sqrt(a[0] * a[0] + a[1] * a[1] + a[2] * a[2]);
     79        GLfloat d = 1.0f / std::sqrt(a[0] * a[0] + a[1] * a[1] + a[2] * a[2]);
    8080        a[0] *= d; a[1] *= d; a[2] *= d;
    8181    }
  • trunk/src/half.h

    r1041 r1146  
    2929     * instead of calling routines with the hidden "this" parameter. */
    3030    inline half() { }
    31     inline half(int f) { *this = makefast(f); }
     31    inline half(int f) { *this = makefast((float)f); }
    3232    inline half(float f) { *this = makefast(f); }
    33     inline half(double f) { *this = makefast(f); }
     33    inline half(double f) { *this = makefast((float)f); }
    3434
    3535    inline int is_nan() const
     
    5454
    5555    /* Cast to other types -- always inline, see constructors */
    56     inline half &operator =(int f) { return *this = makefast(f); }
     56    inline half &operator =(int f) { return *this = makefast((float)f); }
    5757    inline half &operator =(float f) { return *this = makefast(f); }
    58     inline half &operator =(double f) { return *this = makefast(f); }
     58    inline half &operator =(double f) { return *this = makefast((float)f); }
    5959    inline operator int() const { return (int)tofloat(*this); }
    6060    inline operator float() const { return tofloat(*this); }
  • trunk/src/lol/math/vector.h

    r1143 r1146  
    958958    static inline tname<T> normalize(tname<T> const &val) \
    959959    { \
    960         T norm = len(val); \
     960        T norm = (T)len(val); \
    961961        return norm ? val / norm : val * (T)0; \
    962962    }
  • trunk/test/unit/trig.cpp

    r979 r1146  
    3535            double b = lol_sin(f);
    3636            LOLUNIT_SET_CONTEXT(f);
    37             LOLUNIT_ASSERT_DOUBLES_EQUAL(a, b, fabs(f) * 1e-11);
     37            LOLUNIT_ASSERT_DOUBLES_EQUAL(a, b, std::fabs(f) * 1e-11);
    3838        }
    3939
     
    4848            double b = lol_sin(f);
    4949            LOLUNIT_SET_CONTEXT(f);
    50             LOLUNIT_ASSERT_DOUBLES_EQUAL(a, b, fabs(f) * 1e-11);
     50            LOLUNIT_ASSERT_DOUBLES_EQUAL(a, b, std::fabs(f) * 1e-11);
    5151        }
    5252    }
     
    6464            double b = lol_cos(f);
    6565            LOLUNIT_SET_CONTEXT(f);
    66             LOLUNIT_ASSERT_DOUBLES_EQUAL(a, b, fabs(f) * 1e-11);
     66            LOLUNIT_ASSERT_DOUBLES_EQUAL(a, b, std::fabs(f) * 1e-11);
    6767        }
    6868
     
    7777            double b = lol_cos(f);
    7878            LOLUNIT_SET_CONTEXT(f);
    79             LOLUNIT_ASSERT_DOUBLES_EQUAL(a, b, fabs(f) * 1e-11);
     79            LOLUNIT_ASSERT_DOUBLES_EQUAL(a, b, std::fabs(f) * 1e-11);
    8080        }
    8181    }
     
    9696            lol_sincos(f, &b1, &b2);
    9797            LOLUNIT_SET_CONTEXT(f);
    98             LOLUNIT_ASSERT_DOUBLES_EQUAL(a1, b1, fabs(f) * 1e-11);
    99             LOLUNIT_ASSERT_DOUBLES_EQUAL(a2, b2, fabs(f) * 1e-11);
     98            LOLUNIT_ASSERT_DOUBLES_EQUAL(a1, b1, std::fabs(f) * 1e-11);
     99            LOLUNIT_ASSERT_DOUBLES_EQUAL(a2, b2, std::fabs(f) * 1e-11);
    100100        }
    101101
     
    113113            lol_sincos(f, &b1, &b2);
    114114            LOLUNIT_SET_CONTEXT(f);
    115             LOLUNIT_ASSERT_DOUBLES_EQUAL(a1, b1, fabs(f) * 1e-11);
    116             LOLUNIT_ASSERT_DOUBLES_EQUAL(a2, b2, fabs(f) * 1e-11);
     115            LOLUNIT_ASSERT_DOUBLES_EQUAL(a1, b1, std::fabs(f) * 1e-11);
     116            LOLUNIT_ASSERT_DOUBLES_EQUAL(a2, b2, std::fabs(f) * 1e-11);
    117117        }
    118118    }
     
    130130            double b = lol_tan(f);
    131131            LOLUNIT_SET_CONTEXT(f);
    132             if (fabs(a) > 1e4)
    133                 LOLUNIT_ASSERT_DOUBLES_EQUAL(a, b, fabs(a) * fabs(a) * 1e-11);
    134             else if (fabs(a) > 1.0)
    135                 LOLUNIT_ASSERT_DOUBLES_EQUAL(a, b, fabs(a) * 1e-11);
     132            if (std::fabs(a) > 1e4)
     133                LOLUNIT_ASSERT_DOUBLES_EQUAL(a, b, std::fabs(a) * std::fabs(a) * 1e-11);
     134            else if (std::fabs(a) > 1.0)
     135                LOLUNIT_ASSERT_DOUBLES_EQUAL(a, b, std::fabs(a) * 1e-11);
    136136            else
    137                 LOLUNIT_ASSERT_DOUBLES_EQUAL(a, b, fabs(f) * 1e-11);
     137                LOLUNIT_ASSERT_DOUBLES_EQUAL(a, b, std::fabs(f) * 1e-11);
    138138        }
    139139
     
    148148            double b = lol_tan(f);
    149149            LOLUNIT_SET_CONTEXT(f);
    150             if (fabs(a) > 1e4)
    151                 LOLUNIT_ASSERT_DOUBLES_EQUAL(a, b, fabs(a) * fabs(a) * 1e-11);
    152             else if (fabs(a) > 1.0)
    153                 LOLUNIT_ASSERT_DOUBLES_EQUAL(a, b, fabs(a) * 1e-11);
     150            if (std::fabs(a) > 1e4)
     151                LOLUNIT_ASSERT_DOUBLES_EQUAL(a, b, std::fabs(a) * std::fabs(a) * 1e-11);
     152            else if (std::fabs(a) > 1.0)
     153                LOLUNIT_ASSERT_DOUBLES_EQUAL(a, b, std::fabs(a) * 1e-11);
    154154            else
    155                 LOLUNIT_ASSERT_DOUBLES_EQUAL(a, b, fabs(f) * 1e-11);
     155                LOLUNIT_ASSERT_DOUBLES_EQUAL(a, b, std::fabs(f) * 1e-11);
    156156        }
    157157    }
  • trunk/win32/lolcore.vcxproj

    r968 r1146  
    151151    <ClCompile Include="..\src\font.cpp" />
    152152    <ClCompile Include="..\src\forge.cpp" />
     153    <ClCompile Include="..\src\gpu\vbo.cpp" />
    153154    <ClCompile Include="..\src\gradient.cpp" />
    154155    <ClCompile Include="..\src\half.cpp" />
     
    159160    <ClCompile Include="..\src\log.cpp" />
    160161    <ClCompile Include="..\src\map.cpp" />
    161     <ClCompile Include="..\src\matrix.cpp" />
    162162    <ClCompile Include="..\src\platform.cpp" />
    163163    <ClCompile Include="..\src\platform\sdl\sdlapp.cpp" />
     
    176176    <ClCompile Include="..\src\timer.cpp" />
    177177    <ClCompile Include="..\src\trig.cpp" />
     178    <ClCompile Include="..\src\vector.cpp" />
    178179    <ClCompile Include="..\src\video.cpp" />
    179180    <ClCompile Include="..\src\world.cpp" />
     
    195196    <ClInclude Include="..\src\font.h" />
    196197    <ClInclude Include="..\src\forge.h" />
     198    <ClInclude Include="..\src\gpu\vbo.h" />
    197199    <ClInclude Include="..\src\gradient.h" />
    198200    <ClInclude Include="..\src\half.h" />
     
    204206    <ClInclude Include="..\src\loldebug.h" />
    205207    <ClInclude Include="..\src\lolgl.h" />
     208    <ClInclude Include="..\src\lol\math\real.h" />
     209    <ClInclude Include="..\src\lol\math\remez.h" />
     210    <ClInclude Include="..\src\lol\math\vector.h" />
     211    <ClInclude Include="..\src\lol\unit.h" />
    206212    <ClInclude Include="..\src\map.h" />
    207     <ClInclude Include="..\src\matrix.h" />
    208213    <ClInclude Include="..\src\numeric.h" />
    209214    <ClInclude Include="..\src\platform.h" />
     
    211216    <ClInclude Include="..\src\platform\sdl\sdlinput.h" />
    212217    <ClInclude Include="..\src\profiler.h" />
    213     <ClInclude Include="..\src\real.h" />
    214218    <ClInclude Include="..\src\sample.h" />
    215219    <ClInclude Include="..\src\sampler.h" />
     
    219223    <ClInclude Include="..\src\sprite.h" />
    220224    <ClInclude Include="..\src\text.h" />
     225    <ClInclude Include="..\src\thread\thread.h" />
     226    <ClInclude Include="..\src\thread\threadbase.h" />
    221227    <ClInclude Include="..\src\ticker.h" />
    222228    <ClInclude Include="..\src\tiler.h" />
  • trunk/win32/lolcore.vcxproj.filters

    r968 r1146  
    2121      <UniqueIdentifier>{4089421f-2cc2-4036-a6b2-9df8a2f4efc8}</UniqueIdentifier>
    2222    </Filter>
     23    <Filter Include="src\lol">
     24      <UniqueIdentifier>{0edcf1a5-3c9c-4425-918c-aa2cbebc51c1}</UniqueIdentifier>
     25    </Filter>
     26    <Filter Include="src\lol\math">
     27      <UniqueIdentifier>{1e0b7a4c-425f-4d4f-945e-ba2ac9386ce0}</UniqueIdentifier>
     28    </Filter>
     29    <Filter Include="src\gpu">
     30      <UniqueIdentifier>{ec9b94fc-c716-4ef2-9c3b-c7f3447574b0}</UniqueIdentifier>
     31    </Filter>
     32    <Filter Include="src\thread">
     33      <UniqueIdentifier>{d31f75ec-73c8-4bda-9b8c-6d62a55bc30d}</UniqueIdentifier>
     34    </Filter>
    2335  </ItemGroup>
    2436  <ItemGroup>
    25     <ClCompile Include="..\src\audio.cpp">
    26       <Filter>src</Filter>
    27     </ClCompile>
    28     <ClCompile Include="..\src\dict.cpp">
    29       <Filter>src</Filter>
    30     </ClCompile>
    31     <ClCompile Include="..\src\eglapp.cpp">
    32       <Filter>src</Filter>
    33     </ClCompile>
    34     <ClCompile Include="..\src\emitter.cpp">
    35       <Filter>src</Filter>
    36     </ClCompile>
    37     <ClCompile Include="..\src\entity.cpp">
    38       <Filter>src</Filter>
    39     </ClCompile>
    40     <ClCompile Include="..\src\font.cpp">
    41       <Filter>src</Filter>
    42     </ClCompile>
    43     <ClCompile Include="..\src\forge.cpp">
    44       <Filter>src</Filter>
    45     </ClCompile>
    46     <ClCompile Include="..\src\gradient.cpp">
    47       <Filter>src</Filter>
    48     </ClCompile>
    49     <ClCompile Include="..\src\half.cpp">
    50       <Filter>src</Filter>
    51     </ClCompile>
    52     <ClCompile Include="..\src\hash.cpp">
    53       <Filter>src</Filter>
    54     </ClCompile>
    55     <ClCompile Include="..\src\input.cpp">
    56       <Filter>src</Filter>
    57     </ClCompile>
    58     <ClCompile Include="..\src\layer.cpp">
    59       <Filter>src</Filter>
    60     </ClCompile>
    61     <ClCompile Include="..\src\log.cpp">
    62       <Filter>src</Filter>
    63     </ClCompile>
    64     <ClCompile Include="..\src\map.cpp">
    65       <Filter>src</Filter>
    66     </ClCompile>
    67     <ClCompile Include="..\src\matrix.cpp">
    68       <Filter>src</Filter>
    69     </ClCompile>
    70     <ClCompile Include="..\src\platform.cpp">
    71       <Filter>src</Filter>
    72     </ClCompile>
    73     <ClCompile Include="..\src\profiler.cpp">
    74       <Filter>src</Filter>
    75     </ClCompile>
    76     <ClCompile Include="..\src\sample.cpp">
    77       <Filter>src</Filter>
    78     </ClCompile>
    79     <ClCompile Include="..\src\sampler.cpp">
    80       <Filter>src</Filter>
    81     </ClCompile>
    82     <ClCompile Include="..\src\scene.cpp">
    83       <Filter>src</Filter>
    84     </ClCompile>
    85     <ClCompile Include="..\src\sprite.cpp">
    86       <Filter>src</Filter>
    87     </ClCompile>
    88     <ClCompile Include="..\src\text.cpp">
    89       <Filter>src</Filter>
    90     </ClCompile>
    91     <ClCompile Include="..\src\ticker.cpp">
    92       <Filter>src</Filter>
    93     </ClCompile>
    94     <ClCompile Include="..\src\tiler.cpp">
    95       <Filter>src</Filter>
    96     </ClCompile>
    97     <ClCompile Include="..\src\tileset.cpp">
    98       <Filter>src</Filter>
    99     </ClCompile>
    100     <ClCompile Include="..\src\timer.cpp">
    101       <Filter>src</Filter>
    102     </ClCompile>
    103     <ClCompile Include="..\src\trig.cpp">
    104       <Filter>src</Filter>
    105     </ClCompile>
    106     <ClCompile Include="..\src\video.cpp">
    107       <Filter>src</Filter>
    108     </ClCompile>
    109     <ClCompile Include="..\src\world.cpp">
    110       <Filter>src</Filter>
    111     </ClCompile>
    112     <ClCompile Include="..\src\worldentity.cpp">
    113       <Filter>src</Filter>
    114     </ClCompile>
    11537    <ClCompile Include="..\src\image\image.cpp">
    11638      <Filter>src\image</Filter>
     
    14062      <Filter>src\platform\sdl</Filter>
    14163    </ClCompile>
     64    <ClCompile Include="..\src\audio.cpp">
     65      <Filter>src</Filter>
     66    </ClCompile>
     67    <ClCompile Include="..\src\dict.cpp">
     68      <Filter>src</Filter>
     69    </ClCompile>
     70    <ClCompile Include="..\src\eglapp.cpp">
     71      <Filter>src</Filter>
     72    </ClCompile>
     73    <ClCompile Include="..\src\emitter.cpp">
     74      <Filter>src</Filter>
     75    </ClCompile>
     76    <ClCompile Include="..\src\entity.cpp">
     77      <Filter>src</Filter>
     78    </ClCompile>
     79    <ClCompile Include="..\src\font.cpp">
     80      <Filter>src</Filter>
     81    </ClCompile>
     82    <ClCompile Include="..\src\forge.cpp">
     83      <Filter>src</Filter>
     84    </ClCompile>
     85    <ClCompile Include="..\src\gradient.cpp">
     86      <Filter>src</Filter>
     87    </ClCompile>
     88    <ClCompile Include="..\src\half.cpp">
     89      <Filter>src</Filter>
     90    </ClCompile>
     91    <ClCompile Include="..\src\hash.cpp">
     92      <Filter>src</Filter>
     93    </ClCompile>
     94    <ClCompile Include="..\src\input.cpp">
     95      <Filter>src</Filter>
     96    </ClCompile>
     97    <ClCompile Include="..\src\layer.cpp">
     98      <Filter>src</Filter>
     99    </ClCompile>
     100    <ClCompile Include="..\src\log.cpp">
     101      <Filter>src</Filter>
     102    </ClCompile>
     103    <ClCompile Include="..\src\map.cpp">
     104      <Filter>src</Filter>
     105    </ClCompile>
     106    <ClCompile Include="..\src\platform.cpp">
     107      <Filter>src</Filter>
     108    </ClCompile>
     109    <ClCompile Include="..\src\profiler.cpp">
     110      <Filter>src</Filter>
     111    </ClCompile>
    142112    <ClCompile Include="..\src\real.cpp">
    143113      <Filter>src</Filter>
     114    </ClCompile>
     115    <ClCompile Include="..\src\sample.cpp">
     116      <Filter>src</Filter>
     117    </ClCompile>
     118    <ClCompile Include="..\src\sampler.cpp">
     119      <Filter>src</Filter>
     120    </ClCompile>
     121    <ClCompile Include="..\src\scene.cpp">
     122      <Filter>src</Filter>
     123    </ClCompile>
     124    <ClCompile Include="..\src\sprite.cpp">
     125      <Filter>src</Filter>
     126    </ClCompile>
     127    <ClCompile Include="..\src\text.cpp">
     128      <Filter>src</Filter>
     129    </ClCompile>
     130    <ClCompile Include="..\src\ticker.cpp">
     131      <Filter>src</Filter>
     132    </ClCompile>
     133    <ClCompile Include="..\src\tiler.cpp">
     134      <Filter>src</Filter>
     135    </ClCompile>
     136    <ClCompile Include="..\src\tileset.cpp">
     137      <Filter>src</Filter>
     138    </ClCompile>
     139    <ClCompile Include="..\src\timer.cpp">
     140      <Filter>src</Filter>
     141    </ClCompile>
     142    <ClCompile Include="..\src\trig.cpp">
     143      <Filter>src</Filter>
     144    </ClCompile>
     145    <ClCompile Include="..\src\vector.cpp">
     146      <Filter>src</Filter>
     147    </ClCompile>
     148    <ClCompile Include="..\src\video.cpp">
     149      <Filter>src</Filter>
     150    </ClCompile>
     151    <ClCompile Include="..\src\world.cpp">
     152      <Filter>src</Filter>
     153    </ClCompile>
     154    <ClCompile Include="..\src\worldentity.cpp">
     155      <Filter>src</Filter>
     156    </ClCompile>
     157    <ClCompile Include="..\src\gpu\vbo.cpp">
     158      <Filter>src\gpu</Filter>
    144159    </ClCompile>
    145160  </ItemGroup>
    146161  <ItemGroup>
    147     <ClInclude Include="..\src\audio.h">
    148       <Filter>src</Filter>
    149     </ClInclude>
    150     <ClInclude Include="..\src\bitfield.h">
    151       <Filter>src</Filter>
    152     </ClInclude>
    153     <ClInclude Include="..\src\core.h">
    154       <Filter>src</Filter>
    155     </ClInclude>
    156     <ClInclude Include="..\src\dict.h">
    157       <Filter>src</Filter>
    158     </ClInclude>
    159     <ClInclude Include="..\src\eglapp.h">
    160       <Filter>src</Filter>
    161     </ClInclude>
    162     <ClInclude Include="..\src\emitter.h">
    163       <Filter>src</Filter>
    164     </ClInclude>
    165     <ClInclude Include="..\src\entity.h">
    166       <Filter>src</Filter>
    167     </ClInclude>
    168     <ClInclude Include="..\src\font.h">
    169       <Filter>src</Filter>
    170     </ClInclude>
    171     <ClInclude Include="..\src\forge.h">
    172       <Filter>src</Filter>
    173     </ClInclude>
    174     <ClInclude Include="..\src\gradient.h">
    175       <Filter>src</Filter>
    176     </ClInclude>
    177     <ClInclude Include="..\src\half.h">
    178       <Filter>src</Filter>
    179     </ClInclude>
    180     <ClInclude Include="..\src\hash.h">
    181       <Filter>src</Filter>
    182     </ClInclude>
    183     <ClInclude Include="..\src\input.h">
    184       <Filter>src</Filter>
    185     </ClInclude>
    186     <ClInclude Include="..\src\layer.h">
    187       <Filter>src</Filter>
    188     </ClInclude>
    189     <ClInclude Include="..\src\log.h">
    190       <Filter>src</Filter>
    191     </ClInclude>
    192     <ClInclude Include="..\src\loldebug.h">
    193       <Filter>src</Filter>
    194     </ClInclude>
    195     <ClInclude Include="..\src\lolgl.h">
    196       <Filter>src</Filter>
    197     </ClInclude>
    198     <ClInclude Include="..\src\map.h">
    199       <Filter>src</Filter>
    200     </ClInclude>
    201     <ClInclude Include="..\src\matrix.h">
    202       <Filter>src</Filter>
    203     </ClInclude>
    204     <ClInclude Include="..\src\numeric.h">
    205       <Filter>src</Filter>
    206     </ClInclude>
    207     <ClInclude Include="..\src\platform.h">
    208       <Filter>src</Filter>
    209     </ClInclude>
    210     <ClInclude Include="..\src\profiler.h">
    211       <Filter>src</Filter>
    212     </ClInclude>
    213     <ClInclude Include="..\src\sample.h">
    214       <Filter>src</Filter>
    215     </ClInclude>
    216     <ClInclude Include="..\src\sampler.h">
    217       <Filter>src</Filter>
    218     </ClInclude>
    219     <ClInclude Include="..\src\scene.h">
    220       <Filter>src</Filter>
    221     </ClInclude>
    222     <ClInclude Include="..\src\simd.h">
    223       <Filter>src</Filter>
    224     </ClInclude>
    225     <ClInclude Include="..\src\sprite.h">
    226       <Filter>src</Filter>
    227     </ClInclude>
    228     <ClInclude Include="..\src\text.h">
    229       <Filter>src</Filter>
    230     </ClInclude>
    231     <ClInclude Include="..\src\ticker.h">
    232       <Filter>src</Filter>
    233     </ClInclude>
    234     <ClInclude Include="..\src\tiler.h">
    235       <Filter>src</Filter>
    236     </ClInclude>
    237     <ClInclude Include="..\src\tileset.h">
    238       <Filter>src</Filter>
    239     </ClInclude>
    240     <ClInclude Include="..\src\timer.h">
    241       <Filter>src</Filter>
    242     </ClInclude>
    243     <ClInclude Include="..\src\trig.h">
    244       <Filter>src</Filter>
    245     </ClInclude>
    246     <ClInclude Include="..\src\video.h">
    247       <Filter>src</Filter>
    248     </ClInclude>
    249     <ClInclude Include="..\src\world.h">
    250       <Filter>src</Filter>
    251     </ClInclude>
    252     <ClInclude Include="..\src\worldentity.h">
    253       <Filter>src</Filter>
    254     </ClInclude>
    255162    <ClInclude Include="..\src\image\image.h">
    256163      <Filter>src\image</Filter>
     
    280187      <Filter>src\platform\sdl</Filter>
    281188    </ClInclude>
    282     <ClInclude Include="..\src\real.h">
    283       <Filter>src</Filter>
     189    <ClInclude Include="..\src\audio.h">
     190      <Filter>src</Filter>
     191    </ClInclude>
     192    <ClInclude Include="..\src\bitfield.h">
     193      <Filter>src</Filter>
     194    </ClInclude>
     195    <ClInclude Include="..\src\core.h">
     196      <Filter>src</Filter>
     197    </ClInclude>
     198    <ClInclude Include="..\src\dict.h">
     199      <Filter>src</Filter>
     200    </ClInclude>
     201    <ClInclude Include="..\src\eglapp.h">
     202      <Filter>src</Filter>
     203    </ClInclude>
     204    <ClInclude Include="..\src\emitter.h">
     205      <Filter>src</Filter>
     206    </ClInclude>
     207    <ClInclude Include="..\src\entity.h">
     208      <Filter>src</Filter>
     209    </ClInclude>
     210    <ClInclude Include="..\src\font.h">
     211      <Filter>src</Filter>
     212    </ClInclude>
     213    <ClInclude Include="..\src\forge.h">
     214      <Filter>src</Filter>
     215    </ClInclude>
     216    <ClInclude Include="..\src\gradient.h">
     217      <Filter>src</Filter>
     218    </ClInclude>
     219    <ClInclude Include="..\src\half.h">
     220      <Filter>src</Filter>
     221    </ClInclude>
     222    <ClInclude Include="..\src\hash.h">
     223      <Filter>src</Filter>
     224    </ClInclude>
     225    <ClInclude Include="..\src\input.h">
     226      <Filter>src</Filter>
     227    </ClInclude>
     228    <ClInclude Include="..\src\layer.h">
     229      <Filter>src</Filter>
     230    </ClInclude>
     231    <ClInclude Include="..\src\log.h">
     232      <Filter>src</Filter>
     233    </ClInclude>
     234    <ClInclude Include="..\src\loldebug.h">
     235      <Filter>src</Filter>
     236    </ClInclude>
     237    <ClInclude Include="..\src\lolgl.h">
     238      <Filter>src</Filter>
     239    </ClInclude>
     240    <ClInclude Include="..\src\map.h">
     241      <Filter>src</Filter>
     242    </ClInclude>
     243    <ClInclude Include="..\src\numeric.h">
     244      <Filter>src</Filter>
     245    </ClInclude>
     246    <ClInclude Include="..\src\platform.h">
     247      <Filter>src</Filter>
     248    </ClInclude>
     249    <ClInclude Include="..\src\profiler.h">
     250      <Filter>src</Filter>
     251    </ClInclude>
     252    <ClInclude Include="..\src\sample.h">
     253      <Filter>src</Filter>
     254    </ClInclude>
     255    <ClInclude Include="..\src\sampler.h">
     256      <Filter>src</Filter>
     257    </ClInclude>
     258    <ClInclude Include="..\src\scene.h">
     259      <Filter>src</Filter>
     260    </ClInclude>
     261    <ClInclude Include="..\src\simd.h">
     262      <Filter>src</Filter>
     263    </ClInclude>
     264    <ClInclude Include="..\src\sprite.h">
     265      <Filter>src</Filter>
     266    </ClInclude>
     267    <ClInclude Include="..\src\text.h">
     268      <Filter>src</Filter>
     269    </ClInclude>
     270    <ClInclude Include="..\src\ticker.h">
     271      <Filter>src</Filter>
     272    </ClInclude>
     273    <ClInclude Include="..\src\tiler.h">
     274      <Filter>src</Filter>
     275    </ClInclude>
     276    <ClInclude Include="..\src\tileset.h">
     277      <Filter>src</Filter>
     278    </ClInclude>
     279    <ClInclude Include="..\src\timer.h">
     280      <Filter>src</Filter>
     281    </ClInclude>
     282    <ClInclude Include="..\src\trig.h">
     283      <Filter>src</Filter>
     284    </ClInclude>
     285    <ClInclude Include="..\src\video.h">
     286      <Filter>src</Filter>
     287    </ClInclude>
     288    <ClInclude Include="..\src\world.h">
     289      <Filter>src</Filter>
     290    </ClInclude>
     291    <ClInclude Include="..\src\worldentity.h">
     292      <Filter>src</Filter>
     293    </ClInclude>
     294    <ClInclude Include="..\src\lol\math\real.h">
     295      <Filter>src\lol\math</Filter>
     296    </ClInclude>
     297    <ClInclude Include="..\src\lol\math\remez.h">
     298      <Filter>src\lol\math</Filter>
     299    </ClInclude>
     300    <ClInclude Include="..\src\lol\math\vector.h">
     301      <Filter>src\lol\math</Filter>
     302    </ClInclude>
     303    <ClInclude Include="..\src\lol\unit.h">
     304      <Filter>src\lol</Filter>
     305    </ClInclude>
     306    <ClInclude Include="..\src\gpu\vbo.h">
     307      <Filter>src\gpu</Filter>
     308    </ClInclude>
     309    <ClInclude Include="..\src\thread\thread.h">
     310      <Filter>src\thread</Filter>
     311    </ClInclude>
     312    <ClInclude Include="..\src\thread\threadbase.h">
     313      <Filter>src\thread</Filter>
    284314    </ClInclude>
    285315  </ItemGroup>
  • trunk/win32/testsuite.vcxproj

    r968 r1146  
    2020  </ItemGroup>
    2121  <ItemGroup>
    22     <ClCompile Include="..\test\testsuite.cpp" />
    2322    <ClCompile Include="..\test\unit\build.cpp" />
     23    <ClCompile Include="..\test\unit\cmplx.cpp" />
    2424    <ClCompile Include="..\test\unit\half.cpp" />
    25     <ClCompile Include="..\test\unit\matrix.cpp" />
     25    <ClCompile Include="..\test\unit\image.cpp" />
     26    <ClCompile Include="..\test\unit\quat.cpp" />
    2627    <ClCompile Include="..\test\unit\real.cpp" />
    2728    <ClCompile Include="..\test\unit\trig.cpp" />
     29    <ClCompile Include="..\test\unit\vector.cpp" />
    2830  </ItemGroup>
    2931  <PropertyGroup Label="Globals">
Note: See TracChangeset for help on using the changeset viewer.