D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-02-26 08:33:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into merge-2.061-2

Browse Source
This commit is contained in:
David Nadlinger
2013-01-12 01:27:02 +01:00
parent b99b78558b 81aee147cf
commit 30caa4bfe6
30 changed files with 134 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
driver/cl_options.cpp
View File

@@ -11,7 +11,9 @@
#include "gen/cl_helpers.h"
#include "llvm/Target/TargetMachine.h"
#if LDC_LLVM_VER >= 302
#if LDC_LLVM_VER >= 303
#include "llvm/IR/DataLayout.h"
#elif LDC_LLVM_VER == 302
#include "llvm/DataLayout.h"
#else
#include "llvm/Target/TargetData.h"

7
driver/main.cpp
View File

@@ -9,9 +9,14 @@
#include "gen/llvmcompat.h"
#include "gen/llvm.h"
#include "llvm/LinkAllVMCore.h"
#include "llvm/Linker.h"
#if LDC_LLVM_VER >= 303
#include "llvm/LinkAllIR.h"
#include "llvm/IR/LLVMContext.h"
#else
#include "llvm/LinkAllVMCore.h"
#include "llvm/LLVMContext.h"
#endif
#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/TargetOptions.h"
#include "llvm/Support/TargetSelect.h"