Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd0c5a01

Browse files
Reworked directory structure to make libblobstamper integration into other projects more simple
1 parentbf748d4 commitd0c5a01

Some content is hidden

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

42 files changed

+59
-86
lines changed

‎.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ insert_final_newline = true
1010
charset =utf-8
1111
indent_style =space
1212
indent_size =2
13+
14+
[Makefile]
15+
indent_style =tab

‎Makefile

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,60 +4,39 @@
44

55

66
# https://stackoverflow.com/questions/18007326/how-to-change-default-values-of-variables-like-cc-in-makefile
7-
ifeq ($(originCC),default)
7+
ifeq ($(originCC),default)
88
CC = gcc
99
endif
1010

11-
BLOBSTAMPER_SRC :=$(wildcardblobstamper/*.cpp)
11+
BLOBSTAMPER_SRC :=$(wildcardsrc/*.cpp)
1212
BLOBSTAMPER_OBJ :=$(addsuffix .o,$(basename$(BLOBSTAMPER_SRC)))
1313

1414
EXAMPLES_SRC =$(wildcard examples/*.cpp)
1515
EXAMPLES_BIN =$(basename$(EXAMPLES_SRC))
1616

1717

18-
.PHONY: all blob-stamper-all blob-stamper-clean clean test gagaga
18+
.PHONY: all blob-stamper-all blob-stamper-clean clean test
1919

20-
all:$(BLOBSTAMPER_OBJ)
20+
all:blob-stamper-all
2121
@echo All done!
2222

23-
blobstamper/%.o: blobstamper/%.cpp
24-
$(CXX) -c -g$(CXXFLAGS)$< -o$@
25-
26-
27-
# blob-stamper-all:
28-
#$(MAKE) -C blobstamper
29-
30-
#%.o: %.cpp $(DEPS)
31-
#$(CXX) -c -g $(CFLAGS) $<
32-
33-
#%.o: %.c $(DEPS)
34-
#$(CC) -c -g $(CXXFLAGS) $<
35-
23+
src/%.o: src/%.cpp
24+
$(CXX) -c -g$(CXXFLAGS) -I include$< -o$@
3625

26+
blob-stamper-all:$(BLOBSTAMPER_OBJ)
3727

3828
blob-stamper-clean:
39-
rm -f*.o
29+
rm -fsrc/*.o
4030

4131
clean: blob-stamper-clean
42-
$(MAKE) -C blobstamper clean
4332
$(MAKE) -C t clean
4433
$(MAKE) -C examples clean
45-
$(MAKE) -C libtappp clean
4634
$(MAKE) -C console_demo clean
4735
@echo Clean done!
4836

4937
test:
5038
$(MAKE) -C ttest
5139

52-
#test_dict: test_dict.o blob-stamper-all
53-
#$(CXX) $(LDFLAGS) $@.o -o $@ $(BLOB_STAMPER_OBJ)
54-
5540
examples:$(BLOBSTAMPER_OBJ)
5641
$(MAKE) -C examples
5742

58-
gagaga:
59-
@echo -------$(BLOBSTAMPER_OBJ)
60-
61-
#all: blob-stamper-all test_dict $(WRAPPERS_OBJ)
62-
#all: blob-stamper-all $(WRAPPERS_OBJ)
63-
#@echo All done!

‎blobstamper/Makefile

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎console_demo/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
BLOBSTAMPER_SRC :=$(wildcard ../blobstamper/*.cpp)
2+
BLOBSTAMPER_SRC :=$(wildcard ../src/*.cpp)
33
BLOBSTAMPER_OBJ :=$(addsuffix .o,$(basename$(BLOBSTAMPER_SRC)))
44

55
EXAMPLES_SRC =$(wildcard*.cpp)
@@ -12,10 +12,10 @@ build-libtappp:
1212
$(MAKE) -C ../libtappp
1313

1414
%:%.cpp$(BLOBSTAMPER_OBJ)$(BLOBSTAMPER_PG_OBJ)$(WRAPPERS_OBJ)
15-
$(CXX)$(CXXFLAGS) -I.. -o$@$<$(BLOBSTAMPER_OBJ)
15+
$(CXX)$(CXXFLAGS) -I../include -o$@$<$(BLOBSTAMPER_OBJ)
1616

1717
clean:
1818
-rm$(EXAMPLES_BIN)2>/dev/null
1919

20-
.PHONY:testclean all
20+
.PHONY: clean all
2121

‎examples/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
BLOBSTAMPER_SRC :=$(wildcard ../blobstamper/*.cpp)
2+
BLOBSTAMPER_SRC :=$(wildcard ../src/*.cpp)
33
BLOBSTAMPER_OBJ :=$(addsuffix .o,$(basename$(BLOBSTAMPER_SRC)))
44

55
EXAMPLES_SRC =$(wildcard*.cpp)
@@ -12,10 +12,10 @@ build-libtappp:
1212
$(MAKE) -C ../libtappp
1313

1414
%:%.cpp$(BLOBSTAMPER_OBJ)$(BLOBSTAMPER_PG_OBJ)$(WRAPPERS_OBJ)
15-
$(CXX)$(CXXFLAGS) -I.. -o$@$<$(BLOBSTAMPER_OBJ)
15+
$(CXX)$(CXXFLAGS) -I../include -o$@$<$(BLOBSTAMPER_OBJ)
1616

1717
clean:
1818
-rm$(EXAMPLES_BIN)2>/dev/null
1919

20-
.PHONY:testclean all
20+
.PHONY: clean all
2121

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp