Changeset 1535


Ignore:
Timestamp:
Jun 28, 2012, 7:04:34 PM (11 years ago)
Author:
sam
Message:

build: allow to build the PS3 binaries from Visual Studio if the proper
software is installed.

Location:
trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/build/vs2010/Lol.Core.Rules.props

    r1520 r1535  
    1717      <PreprocessorDefinitions Condition="'$(Platform)'=='x64'">WIN32;$(Win32Defines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1818      <PreprocessorDefinitions Condition="'$(Platform)'=='Xbox 360'">_XBOX;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     19      <PreprocessorDefinitions Condition="'$(Platform)'=='PS3'">$(Ps3Defines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1920      <BufferSecurityCheck Condition="'$(Platform)'=='Xbox 360'">false</BufferSecurityCheck>
    2021    </ClCompile>
    … …  
    4445      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;%(AdditionalDependencies)</AdditionalDependencies>
    4546      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     47      <AdditionalLibraryDirectories Condition="'$(Platform)'=='PS3'">$(Ps3Libs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     48      <AdditionalLibraryDirectories Condition="'$(Platform)'=='PS3'">$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     49      <AdditionalDependencies Condition="'$(Platform)'=='PS3'">$(Ps3Deps);%(AdditionalDependencies)</AdditionalDependencies>
     50      <AdditionalDependencies Condition="'$(Platform)'=='PS3'">$(GlDeps);%(AdditionalDependencies)</AdditionalDependencies>
    4651    </Link>
    4752    <Link Condition="'$(Configuration)'=='Release'">

  • trunk/build/vs2010/Lol.Core.Vars.props

    r1520 r1535  
    4444    <GlLibs Condition="'$(Platform)'=='Win32'">$(GlewDir)\lib\i686-w64-mingw32</GlLibs>
    4545    <GlLibs Condition="'$(Platform)'=='x64'">$(GlewDir)\lib\x86_64-w64-mingw32</GlLibs>
    46     <GlDeps>opengl32.lib;glew32.lib</GlDeps>
     46    <GlLibs Condition="'$(Platform)'=='PS3'">$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\opt</GlLibs>
     47    <GlDeps Condition="'$(Platform)'=='Win32'">opengl32.lib;glew32.lib</GlDeps>
     48    <GlDeps Condition="'$(Platform)'=='x64'">opengl32.lib;glew32.lib</GlDeps>
     49    <GlDeps Condition="'$(Platform)'=='PS3'">libPSGL.a;libgcm_cmd.a;libgcm_sys_stub.a;libcgc.a;libPSGLcgc.a</GlDeps>
    4750    <Win32Defines Condition="'$(UseOpenGL)'=='true'">HAVE_GL_2X;USE_GLEW;GLEW_STATIC;$(Win32Defines)</Win32Defines>
     51    <Ps3Defines>HAVE_GLES_2X;$(Ps3Defines)</Ps3Defines>
    4852
    4953    <!-- Direct3D 9 -->
    … …  
    5559    <Win32Defines Condition="'$(UseOpenGL)'=='false'">USE_D3D9;$(Win32Defines)</Win32Defines>
    5660
     61    <!-- PS3-specific -->
     62    <Ps3Deps>libsysmodule_stub.a;libsysutil_stub.a;libresc_stub.a;
     63             libpngdec_stub.a;
     64             libio_stub.a;libusbd_stub.a;libpadfilter.a</Ps3Deps>
     65
     66    <!-- X360-specific -->
    5767    <XboxDefines></XboxDefines>
    5868  </PropertyGroup>
    … …  
    8898    <BuildMacro Include="Win32Defines"><Value>$(Win32Defines)</Value></BuildMacro>
    8999    <BuildMacro Include="XboxDefines"><Value>$(XboxDefines)</Value></BuildMacro>
     100    <BuildMacro Include="Ps3Deps"><Value>$(Ps3Deps)</Value></BuildMacro>
     101    <BuildMacro Include="Ps3Defines"><Value>$(Ps3Defines)</Value></BuildMacro>
    90102  </ItemGroup>
    91103  <PropertyGroup>

  • trunk/build/vs2010/Lol.sln

    r1527 r1535  
    8181Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "neercs", "..\..\tools\neercs\neercs.vcxproj", "{587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}"
    8282EndProject
    83 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Touky", "Touky", "{9EA99B18-D352-47F6-BC04-A0B49CAA2772}"EndProjectProject("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ToukyDemo", "..\..\games\ToukyDemo\ToukyDemo.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F43FECB52}"EndProjectGlobal
     83Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Touky", "Touky", "{9EA99B18-D352-47F6-BC04-A0B49CAA2772}"
     84EndProject
     85Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ToukyDemo", "..\..\games\ToukyDemo\ToukyDemo.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F43FECB52}"
     86EndProject
     87Global
    8488        GlobalSection(SolutionConfigurationPlatforms) = preSolution
     89                Debug|PS3 = Debug|PS3
    8590                Debug|Win32 = Debug|Win32
    8691                Debug|x64 = Debug|x64
    8792                Debug|Xbox 360 = Debug|Xbox 360
     93                Release|PS3 = Release|PS3
    8894                Release|Win32 = Release|Win32
    8995                Release|x64 = Release|x64
    … …  
    9197        EndGlobalSection
    9298        GlobalSection(ProjectConfigurationPlatforms) = postSolution
     99                {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|PS3.ActiveCfg = Debug|PS3
     100                {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|PS3.Build.0 = Debug|PS3
    93101                {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Win32.ActiveCfg = Debug|Win32
    94102                {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Win32.Build.0 = Debug|Win32
    … …  
    98106                {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
    99107                {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
     108                {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|PS3.ActiveCfg = Release|PS3
     109                {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|PS3.Build.0 = Release|PS3
    100110                {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Win32.ActiveCfg = Release|Win32
    101111                {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Win32.Build.0 = Release|Win32
    … …  
    105115                {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Xbox 360.Build.0 = Release|Xbox 360
    106116                {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
     117                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|PS3.ActiveCfg = Debug|PS3
     118                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|PS3.Build.0 = Debug|PS3
    107119                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|Win32.ActiveCfg = Debug|Win32
    108120                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|Win32.Build.0 = Debug|Win32
    … …  
    112124                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
    113125                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
     126                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|PS3.ActiveCfg = Release|PS3
     127                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|PS3.Build.0 = Release|PS3
    114128                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Win32.ActiveCfg = Release|Win32
    115129                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Win32.Build.0 = Release|Win32
    … …  
    119133                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Xbox 360.Build.0 = Release|Xbox 360
    120134                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
     135                {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|PS3.ActiveCfg = Debug|PS3
    121136                {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Win32.ActiveCfg = Debug|Win32
    122137                {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|x64.ActiveCfg = Debug|x64
    123138                {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
     139                {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|PS3.ActiveCfg = Release|PS3
    124140                {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Win32.ActiveCfg = Release|Win32
    125141                {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|x64.ActiveCfg = Release|x64
    126142                {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
     143                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|PS3.ActiveCfg = Debug|PS3
     144                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|PS3.Build.0 = Debug|PS3
    127145                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Win32.ActiveCfg = Debug|Win32
    128146                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Win32.Build.0 = Debug|Win32
    … …  
    132150                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
    133151                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
     152                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|PS3.ActiveCfg = Release|PS3
     153                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|PS3.Build.0 = Release|PS3
    134154                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Win32.ActiveCfg = Release|Win32
    135155                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Win32.Build.0 = Release|Win32
    … …  
    139159                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Xbox 360.Build.0 = Release|Xbox 360
    140160                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
     161                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|PS3.ActiveCfg = Debug|PS3
     162                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|PS3.Build.0 = Debug|PS3
    141163                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Win32.ActiveCfg = Debug|Win32
    142164                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Win32.Build.0 = Debug|Win32
    … …  
    146168                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
    147169                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
     170                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|PS3.ActiveCfg = Release|PS3
     171                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|PS3.Build.0 = Release|PS3
    148172                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Win32.ActiveCfg = Release|Win32
    149173                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Win32.Build.0 = Release|Win32
    … …  
    153177                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Xbox 360.Build.0 = Release|Xbox 360
    154178                {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
     179                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|PS3.ActiveCfg = Debug|PS3
     180                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|PS3.Build.0 = Debug|PS3
    155181                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Win32.ActiveCfg = Debug|Win32
    156182                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Win32.Build.0 = Debug|Win32
    … …  
    160186                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
    161187                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
     188                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|PS3.ActiveCfg = Release|PS3
     189                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|PS3.Build.0 = Release|PS3
    162190                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Win32.ActiveCfg = Release|Win32
    163191                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Win32.Build.0 = Release|Win32
    … …  
    167195                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Xbox 360.Build.0 = Release|Xbox 360
    168196                {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
     197                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|PS3.ActiveCfg = Debug|PS3
     198                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|PS3.Build.0 = Debug|PS3
    169199                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|Win32.ActiveCfg = Debug|Win32
    170200                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|Win32.Build.0 = Debug|Win32
    … …  
    174204                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
    175205                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
     206                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|PS3.ActiveCfg = Release|PS3
     207                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|PS3.Build.0 = Release|PS3
    176208                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|Win32.ActiveCfg = Release|Win32
    177209                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|Win32.Build.0 = Release|Win32
    … …  
    181213                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|Xbox 360.Build.0 = Release|Xbox 360
    182214                {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
     215                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|PS3.ActiveCfg = Debug|PS3
     216                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|PS3.Build.0 = Debug|PS3
    183217                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|Win32.ActiveCfg = Debug|Win32
    184218                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|Win32.Build.0 = Debug|Win32
    … …  
    188222                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
    189223                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
     224                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|PS3.ActiveCfg = Release|PS3
     225                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|PS3.Build.0 = Release|PS3
    190226                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Win32.ActiveCfg = Release|Win32
    191227                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Win32.Build.0 = Release|Win32
    … …  
    195231                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Xbox 360.Build.0 = Release|Xbox 360
    196232                {B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
     233                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|PS3.ActiveCfg = Debug|PS3
     234                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|PS3.Build.0 = Debug|PS3
    197235                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|Win32.ActiveCfg = Debug|Win32
    198236                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|Win32.Build.0 = Debug|Win32
    … …  
    202240                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
    203241                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
     242                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|PS3.ActiveCfg = Release|PS3
     243                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|PS3.Build.0 = Release|PS3
    204244                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Win32.ActiveCfg = Release|Win32
    205245                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Win32.Build.0 = Release|Win32
    … …  
    209249                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Xbox 360.Build.0 = Release|Xbox 360
    210250                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
     251                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|PS3.ActiveCfg = Debug|PS3
     252                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|PS3.Build.0 = Debug|PS3
    211253                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|Win32.ActiveCfg = Debug|Win32
    212254                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|Win32.Build.0 = Debug|Win32
    … …  
    216258                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
    217259                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
     260                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|PS3.ActiveCfg = Release|PS3
     261                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|PS3.Build.0 = Release|PS3
    218262                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Win32.ActiveCfg = Release|Win32
    219263                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Win32.Build.0 = Release|Win32
    … …  
    223267                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Xbox 360.Build.0 = Release|Xbox 360
    224268                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
     269                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Debug|PS3.ActiveCfg = Debug|PS3
     270                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Debug|PS3.Build.0 = Debug|PS3
    225271                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Debug|Win32.ActiveCfg = Debug|Win32
    226272                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Debug|Win32.Build.0 = Debug|Win32
    … …  
    230276                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
    231277                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
     278                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|PS3.ActiveCfg = Release|PS3
     279                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|PS3.Build.0 = Release|PS3
    232280                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|Win32.ActiveCfg = Release|Win32
    233281                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|Win32.Build.0 = Release|Win32
    … …  
    237285                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|Xbox 360.Build.0 = Release|Xbox 360
    238286                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
     287                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|PS3.ActiveCfg = Debug|PS3
     288                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|PS3.Build.0 = Debug|PS3
    239289                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|Win32.ActiveCfg = Debug|Win32
    240290                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|Win32.Build.0 = Debug|Win32
    … …  
    244294                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
    245295                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
     296                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|PS3.ActiveCfg = Release|PS3
     297                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|PS3.Build.0 = Release|PS3
    246298                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|Win32.ActiveCfg = Release|Win32
    247299                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|Win32.Build.0 = Release|Win32
    … …  
    251303                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|Xbox 360.Build.0 = Release|Xbox 360
    252304                {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
     305                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|PS3.ActiveCfg = Debug|PS3
    253306                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|Win32.ActiveCfg = Debug|Win32
    254307                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|Win32.Build.0 = Debug|Win32
    … …  
    258311                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
    259312                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
     313                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|PS3.ActiveCfg = Release|PS3
    260314                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|Win32.ActiveCfg = Release|Win32
    261315                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|Win32.Build.0 = Release|Win32
    … …  
    265319                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|Xbox 360.Build.0 = Release|Xbox 360
    266320                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
     321                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|PS3.ActiveCfg = Debug|PS3
     322                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|PS3.Build.0 = Debug|PS3
     323                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|Win32.ActiveCfg = Debug|Win32
     324                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|Win32.Build.0 = Debug|Win32
     325                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|x64.ActiveCfg = Debug|x64
     326                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|x64.Build.0 = Debug|x64
     327                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
     328                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
     329                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
     330                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|PS3.ActiveCfg = Release|PS3
     331                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|PS3.Build.0 = Release|PS3
     332                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|Win32.ActiveCfg = Release|Win32
     333                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|Win32.Build.0 = Release|Win32
     334                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|x64.ActiveCfg = Release|x64
     335                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|x64.Build.0 = Release|x64
     336                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
     337                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|Xbox 360.Build.0 = Release|Xbox 360
     338                {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
    267339        EndGlobalSection
    268340        GlobalSection(SolutionProperties) = preSolution
    … …  
    289361                {B357514A-7881-422D-8358-161B689E7620} = {3D341D8A-E400-4B1D-BC05-B5C35487D9B5}
    290362                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233} = {B357514A-7881-422D-8358-161B689E7620}
    291                 {EE203B88-44CF-4859-9D42-7A5F43FECB52} = {9EA99B18-D352-47F6-BC04-A0B49CAA2772} EndGlobalSection
     363                {EE203B88-44CF-4859-9D42-7A5F43FECB52} = {9EA99B18-D352-47F6-BC04-A0B49CAA2772}
     364        EndGlobalSection
    292365EndGlobal

  • trunk/games/ToukyDemo/ToukyDemo.vcxproj

    r1526 r1535  
    22<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ItemGroup Label="ProjectConfigurations">
     4    <ProjectConfiguration Include="Debug|PS3">
     5      <Configuration>Debug</Configuration>
     6      <Platform>PS3</Platform>
     7    </ProjectConfiguration>
    48    <ProjectConfiguration Include="Debug|Win32">
    59      <Configuration>Debug</Configuration>
    … …  
    1317      <Configuration>Debug</Configuration>
    1418      <Platform>Xbox 360</Platform>
     19    </ProjectConfiguration>
     20    <ProjectConfiguration Include="Release|PS3">
     21      <Configuration>Release</Configuration>
     22      <Platform>PS3</Platform>
    1523    </ProjectConfiguration>
    1624    <ProjectConfiguration Include="Release|Win32">

  • trunk/src/core.h

    r1513 r1535  
    3030#   define __unlikely(x) __builtin_expect(!!(x), 0)
    3131#   define INLINEATTR __attribute__((always_inline))
    32 #   if defined __CELLOS_LV2__
     32#   if defined __CELLOS_LV2__ && !defined __SNC__
    3333#      define FP_USE(x) __asm__("" : "+f" (x))
    3434#   elif defined __x86_64__

  • trunk/src/lolcore.vcxproj

    r1518 r1535  
    22<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ItemGroup Label="ProjectConfigurations">
     4    <ProjectConfiguration Include="Debug|PS3">
     5      <Configuration>Debug</Configuration>
     6      <Platform>PS3</Platform>
     7    </ProjectConfiguration>
    48    <ProjectConfiguration Include="Debug|Win32">
    59      <Configuration>Debug</Configuration>
    … …  
    1317      <Configuration>Debug</Configuration>
    1418      <Platform>Xbox 360</Platform>
     19    </ProjectConfiguration>
     20    <ProjectConfiguration Include="Release|PS3">
     21      <Configuration>Release</Configuration>
     22      <Platform>PS3</Platform>
    1523    </ProjectConfiguration>
    1624    <ProjectConfiguration Include="Release|Win32">
    … …  
    4452    <CharacterSet>MultiByte</CharacterSet>
    4553  </PropertyGroup>
     54  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="Configuration">
     55    <CharacterSet>MultiByte</CharacterSet>
     56  </PropertyGroup>
    4657  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    4758    <UseDebugLibraries>false</UseDebugLibraries>
    … …  
    5566  </PropertyGroup>
    5667  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration">
     68    <WholeProgramOptimization>true</WholeProgramOptimization>
     69    <CharacterSet>MultiByte</CharacterSet>
     70  </PropertyGroup>
     71  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" Label="Configuration">
    5772    <WholeProgramOptimization>true</WholeProgramOptimization>
    5873    <CharacterSet>MultiByte</CharacterSet>
    … …  
    115130    <ClCompile Include="platform.cpp" />
    116131    <ClCompile Include="platform\d3d9\d3d9input.cpp" />
     132    <ClCompile Condition="'$(Platform)'=='PS3'" Include="platform\ps3\ps3app.cpp" />
     133    <ClCompile Include="platform\ps3\ps3app.cpp" />
     134    <ClCompile Condition="'$(Platform)'=='PS3'" Include="platform\ps3\ps3input.cpp" />
     135    <ClCompile Include="platform\ps3\ps3input.cpp" />
    117136    <ClCompile Include="platform\sdl\sdlapp.cpp" />
    118137    <ClCompile Include="platform\sdl\sdlinput.cpp" />
    … …  
    182201    <ClInclude Include="platform.h" />
    183202    <ClInclude Include="platform\d3d9\d3d9input.h" />
     203    <ClInclude Condition="'$(Platform)'=='PS3'" Include="platform\ps3\ps3app.h" />
     204    <ClInclude Condition="'$(Platform)'=='PS3'" Include="platform\ps3\ps3input.h" />
     205    <ClInclude Condition="'$(Platform)'=='PS3'" Include="platform\ps3\threadbase.h" />
    184206    <ClInclude Include="platform\sdl\sdlapp.h" />
    185207    <ClInclude Include="platform\sdl\sdlinput.h" />

  • trunk/src/lolcore.vcxproj.filters

    r1518 r1535  
    5757      <UniqueIdentifier>{07117029-d79d-4d59-beec-691b00a97c8f}</UniqueIdentifier>
    5858    </Filter>
     59    <Filter Include="src\platform\ps3">
     60      <UniqueIdentifier>{c6c6b597-ed6c-4d82-a166-964beeeeb525}</UniqueIdentifier>
     61    </Filter>
    5962  </ItemGroup>
    6063  <ItemGroup>
    … …  
    236239      <Filter>src\generated</Filter>
    237240    </ClCompile>
     241    <ClCompile Include="platform\ps3\ps3app.cpp">
     242      <Filter>src\platform\ps3</Filter>
     243    </ClCompile>
     244    <ClCompile Include="platform\ps3\ps3input.cpp">
     245      <Filter>src\platform\ps3</Filter>
     246    </ClCompile>
    238247  </ItemGroup>
    239248  <ItemGroup>
    … …  
    442451      <Filter>src\generated</Filter>
    443452    </ClInclude>
     453    <ClInclude Include="platform\ps3\ps3app.h">
     454      <Filter>src\platform\ps3</Filter>
     455    </ClInclude>
     456    <ClInclude Include="platform\ps3\ps3input.h">
     457      <Filter>src\platform\ps3</Filter>
     458    </ClInclude>
     459    <ClInclude Include="platform\ps3\threadbase.h">
     460      <Filter>src\platform\ps3</Filter>
     461    </ClInclude>
    444462  </ItemGroup>
    445463  <ItemGroup>

  • trunk/test/benchsuite.vcxproj

    r1520 r1535  
    22<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ItemGroup Label="ProjectConfigurations">
     4    <ProjectConfiguration Include="Debug|PS3">
     5      <Configuration>Debug</Configuration>
     6      <Platform>PS3</Platform>
     7    </ProjectConfiguration>
    48    <ProjectConfiguration Include="Debug|Win32">
    59      <Configuration>Debug</Configuration>
    … …  
    1317      <Configuration>Debug</Configuration>
    1418      <Platform>Xbox 360</Platform>
     19    </ProjectConfiguration>
     20    <ProjectConfiguration Include="Release|PS3">
     21      <Configuration>Release</Configuration>
     22      <Platform>PS3</Platform>
    1523    </ProjectConfiguration>
    1624    <ProjectConfiguration Include="Release|Win32">

  • trunk/test/debug/quad.vcxproj

    r1520 r1535  
    22<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ItemGroup Label="ProjectConfigurations">
     4    <ProjectConfiguration Include="Debug|PS3">
     5      <Configuration>Debug</Configuration>
     6      <Platform>PS3</Platform>
     7    </ProjectConfiguration>
    48    <ProjectConfiguration Include="Debug|Win32">
    59      <Configuration>Debug</Configuration>
    … …  
    1317      <Configuration>Debug</Configuration>
    1418      <Platform>Xbox 360</Platform>
     19    </ProjectConfiguration>
     20    <ProjectConfiguration Include="Release|PS3">
     21      <Configuration>Release</Configuration>
     22      <Platform>PS3</Platform>
    1523    </ProjectConfiguration>
    1624    <ProjectConfiguration Include="Release|Win32">

  • trunk/test/testsuite.vcxproj

    r1520 r1535  
    22<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ItemGroup Label="ProjectConfigurations">
     4    <ProjectConfiguration Include="Debug|PS3">
     5      <Configuration>Debug</Configuration>
     6      <Platform>PS3</Platform>
     7    </ProjectConfiguration>
    48    <ProjectConfiguration Include="Debug|Win32">
    59      <Configuration>Debug</Configuration>
    … …  
    1317      <Configuration>Debug</Configuration>
    1418      <Platform>Xbox 360</Platform>
     19    </ProjectConfiguration>
     20    <ProjectConfiguration Include="Release|PS3">
     21      <Configuration>Release</Configuration>
     22      <Platform>PS3</Platform>
    1523    </ProjectConfiguration>
    1624    <ProjectConfiguration Include="Release|Win32">

  • trunk/test/unit/trig.cpp

    r1512 r1535  
    3030        {
    3131            double f = (double)i * (1.0 / 1000.0);
    32 #if defined __GNUC__
     32#if defined __GNUC__ && !defined __SNC__
    3333            double a = __builtin_sin(f);
    3434#else
    … …  
    4343        {
    4444            double f = (double)i * (1.0 / 100000.0);
    45 #if defined __GNUC__
     45#if defined __GNUC__ && !defined __SNC__
    4646            double a = __builtin_sin(f);
    4747#else
    … …  
    6161        {
    6262            double f = (double)i * (1.0 / 1000.0);
    63 #if defined __GNUC__
     63#if defined __GNUC__ && !defined __SNC__
    6464            double a = __builtin_cos(f);
    6565#else
    … …  
    7474        {
    7575            double f = (double)i * (1.0 / 100000.0);
    76 #if defined __GNUC__
     76#if defined __GNUC__ && !defined __SNC__
    7777            double a = __builtin_cos(f);
    7878#else
    … …  
    9292        {
    9393            double f = (double)i * (1.0 / 1000.0);
    94 #if defined __GNUC__
     94#if defined __GNUC__ && !defined __SNC__
    9595            double a1 = __builtin_sin(f);
    9696            double a2 = __builtin_cos(f);
    … …  
    109109        {
    110110            double f = (double)i * (1.0 / 100000.0);
    111 #if defined __GNUC__
     111#if defined __GNUC__ && !defined __SNC__
    112112            double a1 = __builtin_sin(f);
    113113            double a2 = __builtin_cos(f);
    … …  
    131131        {
    132132            double f = (double)i * (1.0 / 10000.0);
    133 #if defined __GNUC__
     133#if defined __GNUC__ && !defined __SNC__
    134134            double a = __builtin_tan(f);
    135135#else
    … …  
    149149        {
    150150            double f = (double)i * (1.0 / 100000.0);
    151 #if defined __GNUC__
     151#if defined __GNUC__ && !defined __SNC__
    152152            double a = __builtin_tan(f);
    153153#else

  • trunk/tools/neercs/neercs.vcxproj

    r1520 r1535  
    22<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ItemGroup Label="ProjectConfigurations">
     4    <ProjectConfiguration Include="Debug|PS3">
     5      <Configuration>Debug</Configuration>
     6      <Platform>PS3</Platform>
     7    </ProjectConfiguration>
    48    <ProjectConfiguration Include="Debug|Win32">
    59      <Configuration>Debug</Configuration>
    … …  
    1317      <Configuration>Debug</Configuration>
    1418      <Platform>Xbox 360</Platform>
     19    </ProjectConfiguration>
     20    <ProjectConfiguration Include="Release|PS3">
     21      <Configuration>Release</Configuration>
     22      <Platform>PS3</Platform>
    1523    </ProjectConfiguration>
    1624    <ProjectConfiguration Include="Release|Win32">

  • trunk/tutorial/01_triangle.vcxproj

    r1520 r1535  
    22<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ItemGroup Label="ProjectConfigurations">
     4    <ProjectConfiguration Include="Debug|PS3">
     5      <Configuration>Debug</Configuration>
     6      <Platform>PS3</Platform>
     7    </ProjectConfiguration>
    48    <ProjectConfiguration Include="Debug|Win32">
    59      <Configuration>Debug</Configuration>
    … …  
    1317      <Configuration>Debug</Configuration>
    1418      <Platform>Xbox 360</Platform>
     19    </ProjectConfiguration>
     20    <ProjectConfiguration Include="Release|PS3">
     21      <Configuration>Release</Configuration>
     22      <Platform>PS3</Platform>
    1523    </ProjectConfiguration>
    1624    <ProjectConfiguration Include="Release|Win32">

  • trunk/tutorial/02_cube.vcxproj

    r1520 r1535  
    22<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ItemGroup Label="ProjectConfigurations">
     4    <ProjectConfiguration Include="Debug|PS3">
     5      <Configuration>Debug</Configuration>
     6      <Platform>PS3</Platform>
     7    </ProjectConfiguration>
    48    <ProjectConfiguration Include="Debug|Win32">
    59      <Configuration>Debug</Configuration>
    … …  
    1317      <Configuration>Debug</Configuration>
    1418      <Platform>Xbox 360</Platform>
     19    </ProjectConfiguration>
     20    <ProjectConfiguration Include="Release|PS3">
     21      <Configuration>Release</Configuration>
     22      <Platform>PS3</Platform>
    1523    </ProjectConfiguration>
    1624    <ProjectConfiguration Include="Release|Win32">

  • trunk/tutorial/11_fractal.vcxproj

    r1520 r1535  
    22<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ItemGroup Label="ProjectConfigurations">
     4    <ProjectConfiguration Include="Debug|PS3">
     5      <Configuration>Debug</Configuration>
     6      <Platform>PS3</Platform>
     7    </ProjectConfiguration>
    48    <ProjectConfiguration Include="Debug|Win32">
    59      <Configuration>Debug</Configuration>
    … …  
    1317      <Configuration>Debug</Configuration>
    1418      <Platform>Xbox 360</Platform>
     19    </ProjectConfiguration>
     20    <ProjectConfiguration Include="Release|PS3">
     21      <Configuration>Release</Configuration>
     22      <Platform>PS3</Platform>
    1523    </ProjectConfiguration>
    1624    <ProjectConfiguration Include="Release|Win32">
Note: See TracChangeset for help on using the changeset viewer.