Ignore:
Timestamp:
Apr 4, 2012, 8:40:04 PM (9 years ago)
Author:
sam
Message:

build: major refactoring of the Win32 and Xbox project files; we now
link properly on the Xbox.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/win32/tut02.vcxproj

    r1178 r1189  
    2222    <ClCompile Include="..\test\tutorial\tut02.cpp" />
    2323  </ItemGroup>
     24  <ItemGroup>
     25    <ProjectReference Include="lolcore.vcxproj">
     26      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     27    </ProjectReference>
     28  </ItemGroup>
    2429  <PropertyGroup Label="Globals">
    2530    <ProjectGuid>{7b083da2-fe08-4f6d-bfdd-195d5c2783eb}</ProjectGuid>
    2631    <Keyword>Win32Proj</Keyword>
    27     <RootNamespace>testmap</RootNamespace>
    2832  </PropertyGroup>
    2933  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    … …  
    3135    <ConfigurationType>Application</ConfigurationType>
    3236    <UseDebugLibraries>true</UseDebugLibraries>
    33     <CharacterSet>Unicode</CharacterSet>
     37    <CharacterSet>MultiByte</CharacterSet>
    3438    <UseOfMfc>Dynamic</UseOfMfc>
    3539  </PropertyGroup>
    … …  
    3741    <ConfigurationType>Application</ConfigurationType>
    3842    <UseDebugLibraries>true</UseDebugLibraries>
    39     <CharacterSet>Unicode</CharacterSet>
     43    <CharacterSet>MultiByte</CharacterSet>
    4044    <UseOfMfc>Dynamic</UseOfMfc>
    4145  </PropertyGroup>
    … …  
    4448    <UseDebugLibraries>false</UseDebugLibraries>
    4549    <WholeProgramOptimization>true</WholeProgramOptimization>
    46     <CharacterSet>Unicode</CharacterSet>
     50    <CharacterSet>MultiByte</CharacterSet>
    4751    <UseOfMfc>Dynamic</UseOfMfc>
    4852  </PropertyGroup>
    … …  
    5155    <UseDebugLibraries>false</UseDebugLibraries>
    5256    <WholeProgramOptimization>true</WholeProgramOptimization>
    53     <CharacterSet>Unicode</CharacterSet>
     57    <CharacterSet>MultiByte</CharacterSet>
    5458    <UseOfMfc>Dynamic</UseOfMfc>
    5559  </PropertyGroup>
    … …  
    7478  </ImportGroup>
    7579  <PropertyGroup Label="UserMacros" />
    76   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    77     <IntDir>Debug\$(ProjectName)\</IntDir>
     80  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
    7881    <LinkIncremental>true</LinkIncremental>
    7982  </PropertyGroup>
    80   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
    81     <IntDir>Debug\$(ProjectName)\</IntDir>
    82     <LinkIncremental>true</LinkIncremental>
    83   </PropertyGroup>
    84   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    85     <IntDir>Release\$(ProjectName)\</IntDir>
     83  <PropertyGroup Condition="'$(Configuration)'=='Release'">
    8684    <LinkIncremental>false</LinkIncremental>
    8785  </PropertyGroup>
    88   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
    89     <IntDir>Release\$(ProjectName)\</IntDir>
    90     <LinkIncremental>false</LinkIncremental>
     86  <PropertyGroup>
     87    <OutDir>$(Platform) $(Configuration)\</OutDir>
     88    <IntDir>$(Platform) $(Configuration)\$(ProjectName)\</IntDir>
    9189  </PropertyGroup>
    9290  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    … …  
    10098    </ClCompile>
    10199    <Link>
    102       <SubSystem>Console</SubSystem>
    103100      <GenerateDebugInformation>true</GenerateDebugInformation>
    104       <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);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
     101      <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);$(GdiDeps);$(GlDeps)</AdditionalDependencies>
    105102      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    106103    </Link>
    107104    <PostBuildEvent>
    108       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
     105      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command>
    109106    </PostBuildEvent>
    110107  </ItemDefinitionGroup>
    … …  
    115112      <WarningLevel>Level3</WarningLevel>
    116113      <Optimization>Disabled</Optimization>
     114      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    117115      <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    118       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     116      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    119117    </ClCompile>
    120118    <Link>
    121       <SubSystem>Console</SubSystem>
    122119      <GenerateDebugInformation>true</GenerateDebugInformation>
    123       <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);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    124       <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     120      <AdditionalDependencies>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>
     121      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    125122    </Link>
    126     <PostBuildEvent>
    127       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
    128     </PostBuildEvent>
     123    <Deploy>
     124      <DeploymentType>CopyToHardDrive</DeploymentType>
     125    </Deploy>
    129126  </ItemDefinitionGroup>
    130127  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    … …  
    140137    </ClCompile>
    141138    <Link>
    142       <SubSystem>Console</SubSystem>
    143139      <GenerateDebugInformation>true</GenerateDebugInformation>
    144140      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    145141      <OptimizeReferences>true</OptimizeReferences>
    146       <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);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
     142      <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);$(GdiDeps);$(GlDeps)</AdditionalDependencies>
    147143      <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    148144    </Link>
    149145    <PostBuildEvent>
    150       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
     146      <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll "$(TargetDir)"</Command>
    151147    </PostBuildEvent>
    152148  </ItemDefinitionGroup>
    … …  
    157153      </PrecompiledHeader>
    158154      <Optimization>MaxSpeed</Optimization>
     155      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    159156      <FunctionLevelLinking>true</FunctionLevelLinking>
    160157      <IntrinsicFunctions>true</IntrinsicFunctions>
    161158      <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    162       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     159      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    163160    </ClCompile>
    164161    <Link>
    165       <SubSystem>Console</SubSystem>
    166162      <GenerateDebugInformation>true</GenerateDebugInformation>
    167163      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    168164      <OptimizeReferences>true</OptimizeReferences>
    169       <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);$(GdiDeps);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
    170       <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     165      <AdditionalDependencies>xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     166      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    171167    </Link>
    172     <PostBuildEvent>
    173       <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
    174     </PostBuildEvent>
     168    <Deploy>
     169      <DeploymentType>CopyToHardDrive</DeploymentType>
     170    </Deploy>
    175171  </ItemDefinitionGroup>
    176172  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Note: See TracChangeset for help on using the changeset viewer.