Skip to content

Commit d15fcab

Browse files
utelleutelle
committed
Remove user authentication extension
- remove source files - update build files
1 parent ecbe4ec commit d15fcab

File tree

78 files changed

+192
-709
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+192
-709
lines changed

‎build/sqlite3mc_dll.make‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@ endif
1818
# Configurations
1919
# #############################################
2020

21+
ifeq ($(origin CC), default)
22+
CC = gcc
23+
endif
24+
ifeq ($(origin CXX), default)
25+
CXX = g++
26+
endif
27+
ifeq ($(origin AR), default)
28+
AR = ar
29+
endif
2130
RESCOMP = windres
2231
INCLUDES += -I../src -I../src/aegis/include -I../src/argon2/include
2332
FORCE_INCLUDE +=
@@ -80,22 +89,22 @@ endif
8089
# File sets
8190
# #############################################
8291

83-
CUSTOM :=
8492
GENERATED :=
8593
OBJECTS :=
94+
RESOURCES :=
8695

87-
CUSTOM += $(OBJDIR)/sqlite3mc.res
8896
GENERATED += $(OBJDIR)/sqlite3mc.o
8997
GENERATED += $(OBJDIR)/sqlite3mc.res
9098
OBJECTS += $(OBJDIR)/sqlite3mc.o
99+
RESOURCES += $(OBJDIR)/sqlite3mc.res
91100

92101
# Rules
93102
# #############################################
94103

95104
all: $(TARGET)
96105
@:
97106

98-
$(TARGET): $(CUSTOM) $(GENERATED) $(OBJECTS) $(LDDEPS) | $(TARGETDIR)
107+
$(TARGET): $(GENERATED) $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
99108
$(PRELINKCMDS)
100109
@echo Linking sqlite3mc_dll
101110
$(SILENT) $(LINKCMD)
@@ -132,7 +141,6 @@ endif
132141
prebuild: | $(OBJDIR)
133142
$(PREBUILDCMDS)
134143

135-
$(CUSTOM): | prebuild
136144
ifneq (,$(PCH))
137145
$(OBJECTS): $(GCH) | $(PCH_PLACEHOLDER)
138146
$(GCH): $(PCH) | prebuild

‎build/sqlite3mc_dllicu.make‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@ endif
1818
# Configurations
1919
# #############################################
2020

21+
ifeq ($(origin CC), default)
22+
CC = gcc
23+
endif
24+
ifeq ($(origin CXX), default)
25+
CXX = g++
26+
endif
27+
ifeq ($(origin AR), default)
28+
AR = ar
29+
endif
2130
RESCOMP = windres
2231
INCLUDES += -I../src -I../src/aegis/include -I../src/argon2/include -I"$(LIBICU_PATH)/include"
2332
FORCE_INCLUDE +=
@@ -83,22 +92,22 @@ endif
8392
# File sets
8493
# #############################################
8594

86-
CUSTOM :=
8795
GENERATED :=
8896
OBJECTS :=
97+
RESOURCES :=
8998

90-
CUSTOM += $(OBJDIR)/sqlite3mc.res
9199
GENERATED += $(OBJDIR)/sqlite3mc.o
92100
GENERATED += $(OBJDIR)/sqlite3mc.res
93101
OBJECTS += $(OBJDIR)/sqlite3mc.o
102+
RESOURCES += $(OBJDIR)/sqlite3mc.res
94103

95104
# Rules
96105
# #############################################
97106

98107
all: $(TARGET)
99108
@:
100109

101-
$(TARGET): $(CUSTOM) $(GENERATED) $(OBJECTS) $(LDDEPS) | $(TARGETDIR)
110+
$(TARGET): $(GENERATED) $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
102111
$(PRELINKCMDS)
103112
@echo Linking sqlite3mc_dllicu
104113
$(SILENT) $(LINKCMD)
@@ -135,7 +144,6 @@ endif
135144
prebuild: | $(OBJDIR)
136145
$(PREBUILDCMDS)
137146

138-
$(CUSTOM): | prebuild
139147
ifneq (,$(PCH))
140148
$(OBJECTS): $(GCH) | $(PCH_PLACEHOLDER)
141149
$(GCH): $(PCH) | prebuild

‎build/sqlite3mc_lib.make‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@ endif
1818
# Configurations
1919
# #############################################
2020

21+
ifeq ($(origin CC), default)
22+
CC = gcc
23+
endif
24+
ifeq ($(origin CXX), default)
25+
CXX = g++
26+
endif
27+
ifeq ($(origin AR), default)
28+
AR = ar
29+
endif
2130
RESCOMP = windres
2231
INCLUDES += -I../src -I../src/aegis/include -I../src/argon2/include
2332
FORCE_INCLUDE +=

‎build/sqlite3mc_libicu.make‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@ endif
1818
# Configurations
1919
# #############################################
2020

21+
ifeq ($(origin CC), default)
22+
CC = gcc
23+
endif
24+
ifeq ($(origin CXX), default)
25+
CXX = g++
26+
endif
27+
ifeq ($(origin AR), default)
28+
AR = ar
29+
endif
2130
RESCOMP = windres
2231
INCLUDES += -I../src -I../src/aegis/include -I../src/argon2/include -I"$(LIBICU_PATH)/include"
2332
FORCE_INCLUDE +=

‎build/sqlite3mc_shell.make‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@ endif
1818
# Configurations
1919
# #############################################
2020

21+
ifeq ($(origin CC), default)
22+
CC = gcc
23+
endif
24+
ifeq ($(origin CXX), default)
25+
CXX = g++
26+
endif
27+
ifeq ($(origin AR), default)
28+
AR = ar
29+
endif
2130
RESCOMP = windres
2231
INCLUDES += -I../src
2332
FORCE_INCLUDE +=
@@ -86,22 +95,22 @@ endif
8695
# File sets
8796
# #############################################
8897

89-
CUSTOM :=
9098
GENERATED :=
9199
OBJECTS :=
100+
RESOURCES :=
92101

93-
CUSTOM += $(OBJDIR)/sqlite3mc_shell.res
94102
GENERATED += $(OBJDIR)/shell.o
95103
GENERATED += $(OBJDIR)/sqlite3mc_shell.res
96104
OBJECTS += $(OBJDIR)/shell.o
105+
RESOURCES += $(OBJDIR)/sqlite3mc_shell.res
97106

98107
# Rules
99108
# #############################################
100109

101110
all: $(TARGET)
102111
@:
103112

104-
$(TARGET): $(CUSTOM) $(GENERATED) $(OBJECTS) $(LDDEPS) | $(TARGETDIR)
113+
$(TARGET): $(GENERATED) $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
105114
$(PRELINKCMDS)
106115
@echo Linking sqlite3mc_shell
107116
$(SILENT) $(LINKCMD)
@@ -138,7 +147,6 @@ endif
138147
prebuild: | $(OBJDIR)
139148
$(PREBUILDCMDS)
140149

141-
$(CUSTOM): | prebuild
142150
ifneq (,$(PCH))
143151
$(OBJECTS): $(GCH) | $(PCH_PLACEHOLDER)
144152
$(GCH): $(PCH) | prebuild

‎build/sqlite3mc_shellicu.make‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@ endif
1818
# Configurations
1919
# #############################################
2020

21+
ifeq ($(origin CC), default)
22+
CC = gcc
23+
endif
24+
ifeq ($(origin CXX), default)
25+
CXX = g++
26+
endif
27+
ifeq ($(origin AR), default)
28+
AR = ar
29+
endif
2130
RESCOMP = windres
2231
INCLUDES += -I../src
2332
FORCE_INCLUDE +=
@@ -86,22 +95,22 @@ endif
8695
# File sets
8796
# #############################################
8897

89-
CUSTOM :=
9098
GENERATED :=
9199
OBJECTS :=
100+
RESOURCES :=
92101

93-
CUSTOM += $(OBJDIR)/sqlite3mc_shell.res
94102
GENERATED += $(OBJDIR)/shell.o
95103
GENERATED += $(OBJDIR)/sqlite3mc_shell.res
96104
OBJECTS += $(OBJDIR)/shell.o
105+
RESOURCES += $(OBJDIR)/sqlite3mc_shell.res
97106

98107
# Rules
99108
# #############################################
100109

101110
all: $(TARGET)
102111
@:
103112

104-
$(TARGET): $(CUSTOM) $(GENERATED) $(OBJECTS) $(LDDEPS) | $(TARGETDIR)
113+
$(TARGET): $(GENERATED) $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
105114
$(PRELINKCMDS)
106115
@echo Linking sqlite3mc_shellicu
107116
$(SILENT) $(LINKCMD)
@@ -138,7 +147,6 @@ endif
138147
prebuild: | $(OBJDIR)
139148
$(PREBUILDCMDS)
140149

141-
$(CUSTOM): | prebuild
142150
ifneq (,$(PCH))
143151
$(OBJECTS): $(GCH) | $(PCH_PLACEHOLDER)
144152
$(GCH): $(PCH) | prebuild

‎build/sqlite3mc_vc10_dll.vcxproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@
217217
<ClInclude Include="..\src\sqlite3mc_config.h" />
218218
<ClInclude Include="..\src\sqlite3mc_version.h" />
219219
<ClInclude Include="..\src\sqlite3mc_vfs.h" />
220-
<ClInclude Include="..\src\sqlite3userauth.h" />
221220
<ClInclude Include="..\src\test_windirent.h" />
222221
<ClInclude Include="..\src\zlibwrap.h" />
223222
</ItemGroup>

‎build/sqlite3mc_vc10_dll.vcxproj.filters‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4-
<Filter Include="Header Files">
5-
<UniqueIdentifier>{21EB8090-0D4E-1035-B6D3-48EBA215DCB7}</UniqueIdentifier>
6-
</Filter>
74
<Filter Include="Source Files">
85
<UniqueIdentifier>{E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6}</UniqueIdentifier>
96
</Filter>
7+
<Filter Include="Header Files">
8+
<UniqueIdentifier>{21EB8090-0D4E-1035-B6D3-48EBA215DCB7}</UniqueIdentifier>
9+
</Filter>
1010
</ItemGroup>
1111
<ItemGroup>
1212
<ClInclude Include="..\src\carray.h">
@@ -54,9 +54,6 @@
5454
<ClInclude Include="..\src\sqlite3mc_vfs.h">
5555
<Filter>Header Files</Filter>
5656
</ClInclude>
57-
<ClInclude Include="..\src\sqlite3userauth.h">
58-
<Filter>Header Files</Filter>
59-
</ClInclude>
6057
<ClInclude Include="..\src\test_windirent.h">
6158
<Filter>Header Files</Filter>
6259
</ClInclude>

‎build/sqlite3mc_vc10_dllicu.vcxproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@
225225
<ClInclude Include="..\src\sqlite3mc_config.h" />
226226
<ClInclude Include="..\src\sqlite3mc_version.h" />
227227
<ClInclude Include="..\src\sqlite3mc_vfs.h" />
228-
<ClInclude Include="..\src\sqlite3userauth.h" />
229228
<ClInclude Include="..\src\test_windirent.h" />
230229
<ClInclude Include="..\src\zlibwrap.h" />
231230
</ItemGroup>

‎build/sqlite3mc_vc10_dllicu.vcxproj.filters‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4-
<Filter Include="Header Files">
5-
<UniqueIdentifier>{21EB8090-0D4E-1035-B6D3-48EBA215DCB7}</UniqueIdentifier>
6-
</Filter>
74
<Filter Include="Source Files">
85
<UniqueIdentifier>{E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6}</UniqueIdentifier>
96
</Filter>
7+
<Filter Include="Header Files">
8+
<UniqueIdentifier>{21EB8090-0D4E-1035-B6D3-48EBA215DCB7}</UniqueIdentifier>
9+
</Filter>
1010
</ItemGroup>
1111
<ItemGroup>
1212
<ClInclude Include="..\src\carray.h">
@@ -54,9 +54,6 @@
5454
<ClInclude Include="..\src\sqlite3mc_vfs.h">
5555
<Filter>Header Files</Filter>
5656
</ClInclude>
57-
<ClInclude Include="..\src\sqlite3userauth.h">
58-
<Filter>Header Files</Filter>
59-
</ClInclude>
6057
<ClInclude Include="..\src\test_windirent.h">
6158
<Filter>Header Files</Filter>
6259
</ClInclude>

0 commit comments

Comments
 (0)