Changeset 1165


Ignore:
Timestamp:
Mar 16, 2012, 7:06:49 PM (9 years ago)
Author:
gary
Message:

win32: fix Visual Studio compilation and link issues.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/trig.cpp

    r910 r1165  
    209209    return __builtin_fabs(x);
    210210#else
     211    using std::fabs;
    211212    return fabs(x);
    212213#endif

  • trunk/test/unit/trig.cpp

    r1163 r1165  
    2626    {
    2727        using std::fabs;
     28        using std::sin;
    2829
    2930        for (int i = -10000; i < 10000; i++)
    … …  
    5758    {
    5859        using std::fabs;
     60        using std::cos;
    5961
    6062        for (int i = -10000; i < 10000; i++)
    … …  
    8890    {
    8991        using std::fabs;
     92        using std::sin;
     93        using std::cos;
    9094
    9195        for (int i = -10000; i < 10000; i++)
    … …  
    127131    {
    128132        using std::fabs;
     133        using std::tan;
    129134
    130135        for (int i = -100000; i < 100000; i++)

  • trunk/win32/deushax.vcxproj

    r968 r1165  
    108108      <SubSystem>Console</SubSystem>
    109109      <GenerateDebugInformation>true</GenerateDebugInformation>
    110       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GlDeps)</AdditionalDependencies>
     110      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    111111      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    112112    </Link>
    … …  
    127127      <SubSystem>Console</SubSystem>
    128128      <GenerateDebugInformation>true</GenerateDebugInformation>
    129       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GlDeps)</AdditionalDependencies>
     129      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    130130      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    131131    </Link>
    … …  
    150150      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    151151      <OptimizeReferences>true</OptimizeReferences>
    152       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GlDeps)</AdditionalDependencies>
     152      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    153153      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    154154    </Link>
    … …  
    173173      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    174174      <OptimizeReferences>true</OptimizeReferences>
    175       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GlDeps)</AdditionalDependencies>
     175      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    176176      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    177177    </Link>

  • trunk/win32/editor.vcxproj

    r968 r1165  
    108108      <SubSystem>Console</SubSystem>
    109109      <GenerateDebugInformation>true</GenerateDebugInformation>
    110       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GtkDeps);$(GlDeps)</AdditionalDependencies>
     110      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GtkDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    111111      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    112112    </Link>
    … …  
    127127      <SubSystem>Console</SubSystem>
    128128      <GenerateDebugInformation>true</GenerateDebugInformation>
    129       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GtkDeps);$(GlDeps)</AdditionalDependencies>
     129      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GtkDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    130130      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    131131    </Link>
    … …  
    150150      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    151151      <OptimizeReferences>true</OptimizeReferences>
    152       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GtkDeps);$(GlDeps)</AdditionalDependencies>
     152      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GtkDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    153153      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    154154    </Link>
    … …  
    173173      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    174174      <OptimizeReferences>true</OptimizeReferences>
    175       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GtkDeps);$(GlDeps)</AdditionalDependencies>
     175      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GtkDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    176176      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    177177    </Link>

  • trunk/win32/monsterz.vcxproj

    r968 r1165  
    2525    <ClInclude Include="..\monsterz\monsterz.h" />
    2626    <ClInclude Include="..\monsterz\piece.h" />
     27    <ClInclude Include="..\monsterz\score.h" />
    2728    <ClInclude Include="..\monsterz\thumbs.h" />
    2829    <ClInclude Include="..\monsterz\title.h" />
    … …  
    3435    <ClCompile Include="..\monsterz\monsterz.cpp" />
    3536    <ClCompile Include="..\monsterz\piece.cpp" />
     37    <ClCompile Include="..\monsterz\score.cpp" />
    3638    <ClCompile Include="..\monsterz\thumbs.cpp" />
    3739    <ClCompile Include="..\monsterz\title.cpp" />
    … …  
    117119      <SubSystem>Console</SubSystem>
    118120      <GenerateDebugInformation>true</GenerateDebugInformation>
    119       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GlDeps)</AdditionalDependencies>
     121      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    120122      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    121123    </Link>
    … …  
    136138      <SubSystem>Console</SubSystem>
    137139      <GenerateDebugInformation>true</GenerateDebugInformation>
    138       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GlDeps)</AdditionalDependencies>
     140      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    139141      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    140142    </Link>
    … …  
    159161      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    160162      <OptimizeReferences>true</OptimizeReferences>
    161       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GlDeps)</AdditionalDependencies>
     163      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    162164      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    163165    </Link>
    … …  
    182184      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    183185      <OptimizeReferences>true</OptimizeReferences>
    184       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GlDeps)</AdditionalDependencies>
     186      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(SdlDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    185187      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    186188    </Link>

  • trunk/win32/monsterz.vcxproj.filters

    r906 r1165  
    99    <ClInclude Include="..\monsterz\mash.h" />
    1010    <ClInclude Include="..\monsterz\monsterz.h" />
     11    <ClInclude Include="..\monsterz\score.h" />
    1112  </ItemGroup>
    1213  <ItemGroup>
    … …  
    1819    <ClCompile Include="..\monsterz\title.cpp" />
    1920    <ClCompile Include="..\monsterz\mash.cpp" />
     21    <ClCompile Include="..\monsterz\score.cpp" />
    2022  </ItemGroup>
    2123</Project>
Note: See TracChangeset for help on using the changeset viewer.