diff --git a/README.md b/README.md index 87eeca03..7cdeb6e8 100644 --- a/README.md +++ b/README.md @@ -201,13 +201,11 @@ compiler projects! We really recommend using SwiftPM with LLVMSwift, but if your project is structured in such a way that makes using SwiftPM impractical or impossible, -you can still use LLVMSwift by passing the `-DNO_SWIFTPM` to swift when -compiling. +use the following instructions: - Xcode: - Add this repository as a git submodule - Add the files in `Sources/` to your Xcode project. - - Under `Other Swift Flags`, add `-DNO_SWIFTPM`. - Under `Library Search Paths` add the output of `llvm-config --libdir` - Under `Header Search Paths` add the output of `llvm-config --includedir` - Under `Link Target with Libraries` drag in diff --git a/Sources/LLVM/Alias.swift b/Sources/LLVM/Alias.swift index c90d480f..856cc0a8 100644 --- a/Sources/LLVM/Alias.swift +++ b/Sources/LLVM/Alias.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/ArrayType.swift b/Sources/LLVM/ArrayType.swift index 760419aa..698b29ec 100644 --- a/Sources/LLVM/ArrayType.swift +++ b/Sources/LLVM/ArrayType.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/BasicBlock.swift b/Sources/LLVM/BasicBlock.swift index 7af370d3..0e121e54 100644 --- a/Sources/LLVM/BasicBlock.swift +++ b/Sources/LLVM/BasicBlock.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/Call.swift b/Sources/LLVM/Call.swift index a10b6338..f8a51a42 100644 --- a/Sources/LLVM/Call.swift +++ b/Sources/LLVM/Call.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/Clause.swift b/Sources/LLVM/Clause.swift index 610eb677..c45c7995 100644 --- a/Sources/LLVM/Clause.swift +++ b/Sources/LLVM/Clause.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/Constant.swift b/Sources/LLVM/Constant.swift index 40329495..d041e6c9 100644 --- a/Sources/LLVM/Constant.swift +++ b/Sources/LLVM/Constant.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/FloatType.swift b/Sources/LLVM/FloatType.swift index 7c7b232d..1bbc76d7 100644 --- a/Sources/LLVM/FloatType.swift +++ b/Sources/LLVM/FloatType.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/Function.swift b/Sources/LLVM/Function.swift index 6ed3b363..b9440252 100644 --- a/Sources/LLVM/Function.swift +++ b/Sources/LLVM/Function.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/FunctionType.swift b/Sources/LLVM/FunctionType.swift index fe9aba74..14d2415a 100644 --- a/Sources/LLVM/FunctionType.swift +++ b/Sources/LLVM/FunctionType.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/Global.swift b/Sources/LLVM/Global.swift index 43b49425..aa8b4469 100644 --- a/Sources/LLVM/Global.swift +++ b/Sources/LLVM/Global.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/IRBuilder.swift b/Sources/LLVM/IRBuilder.swift index c3ab7578..6afd3884 100644 --- a/Sources/LLVM/IRBuilder.swift +++ b/Sources/LLVM/IRBuilder.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/IRGlobal.swift b/Sources/LLVM/IRGlobal.swift index 65546ff2..ac46f321 100644 --- a/Sources/LLVM/IRGlobal.swift +++ b/Sources/LLVM/IRGlobal.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/IRType.swift b/Sources/LLVM/IRType.swift index bc769d28..6633ac68 100644 --- a/Sources/LLVM/IRType.swift +++ b/Sources/LLVM/IRType.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/IRValue+Kinds.swift b/Sources/LLVM/IRValue+Kinds.swift index 8168c091..30e73b35 100644 --- a/Sources/LLVM/IRValue+Kinds.swift +++ b/Sources/LLVM/IRValue+Kinds.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/IRValue.swift b/Sources/LLVM/IRValue.swift index 0ed70a66..7a2bace4 100644 --- a/Sources/LLVM/IRValue.swift +++ b/Sources/LLVM/IRValue.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/Initialization.swift b/Sources/LLVM/Initialization.swift index 486076a2..33b3de35 100644 --- a/Sources/LLVM/Initialization.swift +++ b/Sources/LLVM/Initialization.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/Instruction.swift b/Sources/LLVM/Instruction.swift index 28e8a085..c8573709 100644 --- a/Sources/LLVM/Instruction.swift +++ b/Sources/LLVM/Instruction.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/IntType.swift b/Sources/LLVM/IntType.swift index 188a3929..59457f57 100644 --- a/Sources/LLVM/IntType.swift +++ b/Sources/LLVM/IntType.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/JIT.swift b/Sources/LLVM/JIT.swift index 09153c43..497bdde2 100644 --- a/Sources/LLVM/JIT.swift +++ b/Sources/LLVM/JIT.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/LabelType.swift b/Sources/LLVM/LabelType.swift index 74c8facb..974ecc4d 100644 --- a/Sources/LLVM/LabelType.swift +++ b/Sources/LLVM/LabelType.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/Linkage.swift b/Sources/LLVM/Linkage.swift index d646316a..336ff724 100644 --- a/Sources/LLVM/Linkage.swift +++ b/Sources/LLVM/Linkage.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/MemoryBuffer.swift b/Sources/LLVM/MemoryBuffer.swift index cbea7a21..5e138159 100644 --- a/Sources/LLVM/MemoryBuffer.swift +++ b/Sources/LLVM/MemoryBuffer.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/MetadataType.swift b/Sources/LLVM/MetadataType.swift index 3fc03731..e72c7adf 100644 --- a/Sources/LLVM/MetadataType.swift +++ b/Sources/LLVM/MetadataType.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/Module.swift b/Sources/LLVM/Module.swift index 9a424860..11392c08 100644 --- a/Sources/LLVM/Module.swift +++ b/Sources/LLVM/Module.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/ObjectFile.swift b/Sources/LLVM/ObjectFile.swift index c6bafedb..ed741dee 100644 --- a/Sources/LLVM/ObjectFile.swift +++ b/Sources/LLVM/ObjectFile.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/OpCode.swift b/Sources/LLVM/OpCode.swift index 5e70ff5f..7c03c296 100644 --- a/Sources/LLVM/OpCode.swift +++ b/Sources/LLVM/OpCode.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/PassManager.swift b/Sources/LLVM/PassManager.swift index ca6d4f37..591d013b 100644 --- a/Sources/LLVM/PassManager.swift +++ b/Sources/LLVM/PassManager.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/PhiNode.swift b/Sources/LLVM/PhiNode.swift index e04b9e73..06f46793 100644 --- a/Sources/LLVM/PhiNode.swift +++ b/Sources/LLVM/PhiNode.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/PointerType.swift b/Sources/LLVM/PointerType.swift index 1f9ee2db..77c4a957 100644 --- a/Sources/LLVM/PointerType.swift +++ b/Sources/LLVM/PointerType.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/StructType.swift b/Sources/LLVM/StructType.swift index aa3be8ec..6a5ebf64 100644 --- a/Sources/LLVM/StructType.swift +++ b/Sources/LLVM/StructType.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/Switch.swift b/Sources/LLVM/Switch.swift index b47a2b2d..b90b7ffe 100644 --- a/Sources/LLVM/Switch.swift +++ b/Sources/LLVM/Switch.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/TargetData.swift b/Sources/LLVM/TargetData.swift index b032a37c..b5a03030 100644 --- a/Sources/LLVM/TargetData.swift +++ b/Sources/LLVM/TargetData.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/TargetMachine.swift b/Sources/LLVM/TargetMachine.swift index d183a419..9c528218 100644 --- a/Sources/LLVM/TargetMachine.swift +++ b/Sources/LLVM/TargetMachine.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/TokenType.swift b/Sources/LLVM/TokenType.swift index 0895655c..e99d6381 100644 --- a/Sources/LLVM/TokenType.swift +++ b/Sources/LLVM/TokenType.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/Use.swift b/Sources/LLVM/Use.swift index 8cebf4bb..ab52910b 100644 --- a/Sources/LLVM/Use.swift +++ b/Sources/LLVM/Use.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/VectorType.swift b/Sources/LLVM/VectorType.swift index 88960e3c..e73dbfd8 100644 --- a/Sources/LLVM/VectorType.swift +++ b/Sources/LLVM/VectorType.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/VoidType.swift b/Sources/LLVM/VoidType.swift index 989f12b2..ee395559 100644 --- a/Sources/LLVM/VoidType.swift +++ b/Sources/LLVM/VoidType.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif diff --git a/Sources/LLVM/X86MMXType.swift b/Sources/LLVM/X86MMXType.swift index 2c1e3539..4136e689 100644 --- a/Sources/LLVM/X86MMXType.swift +++ b/Sources/LLVM/X86MMXType.swift @@ -1,4 +1,4 @@ -#if !NO_SWIFTPM +#if SWIFT_PACKAGE import cllvm #endif