piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some more work on CMake on Windows:

Browse Source 
- add support for precompiled headers with MSVC
- compile with _FILE_OFFSET_BITS=64 and _LARGEFILE_SOURCE only for our sources, some dependencies seem to have problems with it enabled...
- disable -Wall for MSVC too prevent warning flood
- rename aes_cbc.c and aes_core.c to cpp files since it makes stuff a lot easier and there's really no reason not to do it since they had been compiled as C++ before anyway

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6797 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
NeoBrainX
2011-01-09 16:36:19 +00:00
parent e6c87cbe3d
commit 81638396c0
7 changed files with 52 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Common/CMakeLists.txt
View File

@ -30,17 +30,19 @@ set(SRCS Src/ABI.cpp
Src/Version.cpp
Src/x64Analyzer.cpp
Src/x64Emitter.cpp
Src/Crypto/aes_cbc.c
Src/Crypto/aes_core.c
Src/Crypto/aes_cbc.cpp
Src/Crypto/aes_core.cpp
Src/Crypto/bn.cpp
Src/Crypto/ec.cpp
Src/Crypto/md5.cpp
Src/Crypto/sha1.cpp)
if(WIN32)
set(SRCS ${SRCS} Src/ExtendedTrace.cpp Src/stdafx.cpp)
set(SRCS ${SRCS} Src/ExtendedTrace.cpp)
endif(WIN32)
enable_precompiled_headers(Src/stdafx.h Src/stdafx.cpp SRCS)
add_library(common STATIC ${SRCS})
target_link_libraries(common ${CMAKE_DL_LIBS})
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")

112
Source/Core/Common/Common.vcproj
View File

@ -537,120 +537,12 @@
>
</File>
<File
RelativePath=".\Src\Crypto\aes_cbc.c"
RelativePath=".\Src\Crypto\aes_cbc.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
</File>
<File
RelativePath=".\Src\Crypto\aes_core.c"
RelativePath=".\Src\Crypto\aes_core.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
>
<Tool
Name="VCCLCompilerTool"
CompileAs="2"
ForcedIncludeFiles=""
/>
</FileConfiguration>
</File>
<File
RelativePath=".\Src\Crypto\aes_locl.h"

0
Source/Core/Common/Src/Crypto/aes_cbc.c → Source/Core/Common/Src/Crypto/aes_cbc.cpp
View File

0
Source/Core/Common/Src/Crypto/aes_core.c → Source/Core/Common/Src/Crypto/aes_core.cpp
View File

4
Source/Core/Common/Src/SConscript
View File

@ -42,8 +42,8 @@ files = [
"Version.cpp",
"x64Emitter.cpp",
"x64Analyzer.cpp",
"Crypto/aes_cbc.c",
"Crypto/aes_core.c",
"Crypto/aes_cbc.cpp",
"Crypto/aes_core.cpp",
"Crypto/bn.cpp",
"Crypto/ec.cpp",
"Crypto/md5.cpp",