Skip to content

Commit c60eb4a

Browse files
committed
Remove sqlite-cflags.txt
1 parent 94e2000 commit c60eb4a

File tree

2 files changed

+1
-20
lines changed

2 files changed

+1
-20
lines changed

Plugins/Makefile

+1-19
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,14 @@ BUILD_DIRS = \
2424
lib/webgl
2525

2626
SQLITE_SRC = sqlite-amalgamation/sqlite3.c
27-
SQLITE_CFLAGS_SRC = tools~/sqlite-cflags.txt
2827
SQLITE_NET_SRC = $(wildcard sqlite-net~/src/*.cs) sqlite-net~/LICENSE.txt
2928
SQLITE_NET_DEST = ../Runtime/sqlite-net
3029
SQLITE_NET_SED_SCRIPT = tools~/fix-library-path.sed
3130

32-
ifneq ($(findstring 4.,$(MAKE_VERSION)),)
33-
SQLITE_CFLAGS = $(file < $(SQLITE_CFLAGS_SRC))
34-
else
35-
SQLITE_CFLAGS = $(shell cat $(SQLITE_CFLAGS_SRC))
36-
endif
37-
CFLAGS += $(SQLITE_CFLAGS)
38-
3931
$(BUILD_DIRS):
4032
mkdir -p $@
4133

4234
.PRECIOUS: lib/%/sqlite3.o~
43-
lib/%/sqlite3.o~: .EXTRA_PREREQS = $(SQLITE_CFLAGS_SRC)
4435
lib/%/sqlite3.o~: $(SQLITE_SRC) | lib/%
4536
$(CC) -c -o $@ $< $(CFLAGS)
4637

@@ -64,11 +55,6 @@ ifdef MACOS_CODESIGN_SIGNATURE
6455
$(CODESIGN) -s "$(MACOS_CODESIGN_SIGNATURE)" $@
6556
endif
6657

67-
# iOS/tvOS/visionOS compile flags
68-
sqlite-amalgamation/sqlite3.c.meta: .EXTRA_PREREQS = $(SQLITE_CFLAGS_SRC)
69-
sqlite-amalgamation/sqlite3.c.meta:
70-
sed -i '' -E -e 's/(\s*CompileFlags:).*/\1 $(SQLITE_CFLAGS)/' $@
71-
7258
# Android
7359
check-ndk-root:
7460
ifndef ANDROID_NDK_ROOT
@@ -85,10 +71,6 @@ lib/android/arm32/libgilzoide-sqlite-net.so: CC = $(wildcard $(ANDROID_NDK_ROOT)
8571
lib/android/x86_64/libgilzoide-sqlite-net.so: CC = $(wildcard $(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/*/bin/x86_64-linux-android21-clang)
8672
lib/android/x86/libgilzoide-sqlite-net.so: CC = $(wildcard $(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/*/bin/i686-linux-android21-clang)
8773

88-
# WebGL
89-
lib/webgl/libgilzoide-sqlite-net.bc: .EXTRA_PREREQS = $(SQLITE_CFLAGS_SRC)
90-
lib/webgl/libgilzoide-sqlite-net.bc: $(SQLITE_SRC) | lib/webgl
91-
$(EMCC) -c -emit-llvm -o $@ $< $(CFLAGS)
9274

9375
# Source
9476
$(SQLITE_NET_DEST)/%.cs: sqlite-net~/src/%.cs $(SQLITE_NET_SED_SCRIPT)
@@ -128,7 +110,7 @@ webgl: lib/webgl/libgilzoide-sqlite-net.bc
128110
source: $(SQLITE_NET_DEST)/License.txt $(SQLITE_NET_DEST)/AssemblyInfo.cs $(SQLITE_NET_DEST)/SQLite.cs $(SQLITE_NET_DEST)/SQLiteAsync.cs
129111

130112
all-android: android-arm64 android-arm32 android-x86_64 android-x86
131-
all-apple: macos-universal sqlite-amalgamation/sqlite3.c.meta
113+
all-apple: macos-universal
132114
all-linux: linux-x86_64
133115
all-webgl: webgl
134116
all-windows: windows-x86_64 windows-x86

Plugins/tools~/sqlite-cflags.txt

-1
This file was deleted.

0 commit comments

Comments
 (0)