diff options
| author | Manu <manu-silicon@users.noreply.github.com> | 2015-12-02 08:02:47 +0300 |
|---|---|---|
| committer | Manu <manu-silicon@users.noreply.github.com> | 2015-12-04 04:51:54 +0300 |
| commit | efe3fca48cf76b8857fc9cc68f6a5a962d25c17e (patch) | |
| tree | d6c7d85bba075fd37c2f0ad1cc87136fd9a1e0e9 /src/Native | |
| parent | 848ecc1fffca53f428d29cb5f40d4ca4187283d7 (diff) | |
Removed the definitions of TARGET_xxx macros
We are now using _TARGET_xxx_.
Removed duplicated definitions of macros.
Define the _WINXX preprocessor macros on Windows only.
Move definitions of _WIN32 and _WIN64 to a more specific place
that handles Windows specifics.
Diffstat (limited to 'src/Native')
| -rw-r--r-- | src/Native/Bootstrap/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | src/Native/CMakeLists.txt | 12 |
2 files changed, 5 insertions, 25 deletions
diff --git a/src/Native/Bootstrap/CMakeLists.txt b/src/Native/Bootstrap/CMakeLists.txt index cd753ab9a..db9acf1ba 100644 --- a/src/Native/Bootstrap/CMakeLists.txt +++ b/src/Native/Bootstrap/CMakeLists.txt @@ -9,21 +9,5 @@ add_compile_options(-Wno-unused-private-field) add_compile_options(-Wno-tautological-undefined-compare) endif() -if(CLR_CMAKE_PLATFORM_ARCH_AMD64) - add_definitions(-D_TARGET_AMD64_=1) - add_definitions(-D_WIN64=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_I386) - add_definitions(-D_TARGET_X86_=1) - add_definitions(-D_WIN32=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) - add_definitions(-D_TARGET_ARM_=1) - add_definitions(-D_WIN32=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) - add_definitions(-D_TARGET_ARM64_=1) - add_definitions(-D_WIN64=1) -else() - clr_unknown_arch() -endif() - add_subdirectory(base) -add_subdirectory(cpp)
\ No newline at end of file +add_subdirectory(cpp) diff --git a/src/Native/CMakeLists.txt b/src/Native/CMakeLists.txt index 213f81690..120dce68f 100644 --- a/src/Native/CMakeLists.txt +++ b/src/Native/CMakeLists.txt @@ -126,22 +126,14 @@ if(CLR_CMAKE_PLATFORM_ARCH_AMD64) add_definitions(-D_TARGET_AMD64_=1) add_definitions(-D_AMD64_) add_definitions(-DAMD64) - add_definitions(-DTARGET_X64) - add_definitions(-DTARGET_AMD64) - add_definitions(-D_WIN64=1) elseif(CLR_CMAKE_PLATFORM_ARCH_I386) add_definitions(-D_TARGET_X86_=1) add_definitions(-D_X86_) - add_definitions(-DTARGET_X86) - add_definitions(-D_WIN32=1) elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) add_definitions(-D_TARGET_ARM_=1) add_definitions(-D_ARM_) - add_definitions(-DTARGET_ARM) - add_definitions(-D_WIN32=1) elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) add_definitions(-D_TARGET_ARM64_=1) - add_definitions(-D_WIN64=1) else() clr_unknown_arch() endif() @@ -159,6 +151,10 @@ endfunction(convert_to_absolute_path) if(WIN32) add_definitions(-DWIN32) + add_definitions(-D_WIN32=1) + if(IS_64BIT_BUILD) + add_definitions(-D_WIN64=1) + endif() add_compile_options($<$<CONFIG:Debug>:-DDEBUG>) else(WIN32) string(TOUPPER ${CMAKE_BUILD_TYPE} UPPERCASE_CMAKE_BUILD_TYPE) |