fabs/netatmo-algo
1
0
Fork 0
Code Projects Releases Activity

rename output bins

Browse source
This commit is contained in:
Fabien Freling 2022-02-18 12:49:02 +01:00
parent 8f4e23452b
commit d54a231f91
5 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,5 +1,5 @@
*.zip *.zip
packing_* packing-*
build.sh build.sh
*.a *.a

2
build-cli.sh
View file

@ -11,4 +11,4 @@ cd "src"
(ar rcs libpacking.a a2.o bounding_box.o frame.o mapping.o mask.o pack.o png.o) (ar rcs libpacking.a a2.o bounding_box.o frame.o mapping.o mask.o pack.o png.o)
(clang++ -c main_cli.cpp -o main_cli.o -Wall -Werror -std=c++17 -fcolor-diagnostics -g -O1 -I./3rd-party/stb) (clang++ -c main_cli.cpp -o main_cli.o -Wall -Werror -std=c++17 -fcolor-diagnostics -g -O1 -I./3rd-party/stb)
(clang++ -c png_impl.cpp -o png_impl.o -Wall -Werror -std=c++17 -fcolor-diagnostics -g -O1 -I./3rd-party/stb) (clang++ -c png_impl.cpp -o png_impl.o -Wall -Werror -std=c++17 -fcolor-diagnostics -g -O1 -I./3rd-party/stb)
(clang++ libpacking.a main_cli.o png_impl.o -o ../packing_cli -L. -lpacking) (clang++ libpacking.a main_cli.o png_impl.o -o ../packing-cli -L. -lpacking)

2
build-gui.sh
View file

@ -11,4 +11,4 @@ cd "src"
(ar rcs libpacking.a a2.o bounding_box.o frame.o mapping.o mask.o pack.o png.o) (ar rcs libpacking.a a2.o bounding_box.o frame.o mapping.o mask.o pack.o png.o)
(cd 3rd-party/raylib-4.0.0/src && make CC=clang PLATFORM=PLATFORM_DESKTOP RAYLIB_MODULE_AUDIO=FALSE RAYLIB_MODULE_MODELS=FALSE) (cd 3rd-party/raylib-4.0.0/src && make CC=clang PLATFORM=PLATFORM_DESKTOP RAYLIB_MODULE_AUDIO=FALSE RAYLIB_MODULE_MODELS=FALSE)
(clang++ -c main_gui.cpp -o main_gui.o -Wall -Werror -std=c++17 -fcolor-diagnostics -g -O1 -I./3rd-party/stb -I3rd-party/raylib-4.0.0/src) (clang++ -c main_gui.cpp -o main_gui.o -Wall -Werror -std=c++17 -fcolor-diagnostics -g -O1 -I./3rd-party/stb -I3rd-party/raylib-4.0.0/src)
(clang++ libpacking.a main_gui.o -o ../packing_gui -L. -lpacking -L3rd-party/raylib-4.0.0 -lraylib -lGL -lc -lm -lpthread -ldl -lrt -lX11) (clang++ libpacking.a main_gui.o -o ../packing-gui -L. -lpacking -L3rd-party/raylib-4.0.0 -lraylib -lGL -lc -lm -lpthread -ldl -lrt -lX11)

6
justfile
View file

@ -1,6 +1,6 @@
name := "freling_netatmo_algo" name := "freling_netatmo_algo"
exe_cli := "./packing_cli" exe_cli := "./packing-cli"
exe_gui := "./packing_gui" exe_gui := "./packing-gui"
build_sh := "build.sh" build_sh := "build.sh"
params := "lenna.png 0 0 64 64 100 100 100 64 80 200 70 220" params := "lenna.png 0 0 64 64 100 100 100 64 80 200 70 220"
@ -44,4 +44,6 @@ callgrind: build-cli
valgrind --tool=callgrind {{exe_cli}} {{params}} valgrind --tool=callgrind {{exe_cli}} {{params}}
archive: #generate-build archive: #generate-build
git clean -xf src/
rm --force {{exe_cli}} {{exe_gui}}
git archive --add-file={{build_sh}} --output={{name}}.zip --prefix={{name}}/ HEAD git archive --add-file={{build_sh}} --output={{name}}.zip --prefix={{name}}/ HEAD

4
src/Tupfile
View file

@ -15,7 +15,7 @@ GUI_LINK_FLAGS = $(LINK_FLAGS) -L3rd-party/raylib-4.0.0 -lraylib -lGL -lc -lm -l
: {objs} |> ^ AR %o^ ar rcs %o %f |> libpacking.a : {objs} |> ^ AR %o^ ar rcs %o %f |> libpacking.a
: foreach main_cli.cpp png_impl.cpp |> ^ CXX %f^ clang++ -c %f -o %o $(CPPFLAGS) |> %B.o {cli} : foreach main_cli.cpp png_impl.cpp |> ^ CXX %f^ clang++ -c %f -o %o $(CPPFLAGS) |> %B.o {cli}
: libpacking.a {cli} |> ^ LINK %o^ clang++ %f -o %o $(LINK_FLAGS) |> ../packing_cli : libpacking.a {cli} |> ^ LINK %o^ clang++ %f -o %o $(LINK_FLAGS) |> ../packing-cli
: main_gui.cpp |> ^ CXX %f^ clang++ -c %f -o %o $(CPPFLAGS) $(GUI_FLAGS) |> %B.o {gui} : main_gui.cpp |> ^ CXX %f^ clang++ -c %f -o %o $(CPPFLAGS) $(GUI_FLAGS) |> %B.o {gui}
: libpacking.a {gui} | 3rd-party/<raylib> |> ^ LINK %o^ clang++ %f -o %o $(GUI_LINK_FLAGS) |> ../packing_gui : libpacking.a {gui} | 3rd-party/<raylib> |> ^ LINK %o^ clang++ %f -o %o $(GUI_LINK_FLAGS) |> ../packing-gui