Skip to content

Commit d960e87

Browse files
petabytpetabyt
committed
camlib->libpict, fix some build flags
1 parent 61f8a76 commit d960e87

22 files changed

+36
-28
lines changed

‎.github/workflows/unit.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ jobs:
2626
sudo make install
2727
- name: Compile desktop
2828
run: cd desktop && cmake -G Ninja -B build && cmake --build build
29-
- name: Run desktop unit test
30-
run: desktop/build/fudge --test-wifi
29+
# - name: Run desktop unit test
30+
# run: desktop/build/fudge --test-wifi

‎desktop/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ endif()
1212
# hello_imgui
1313
set(HELLOIMGUI_BUILD_AUTOMATION_TEST OFF)
1414
set(HELLOIMGUI_ADD_APP_WITH_INSTALL OFF)
15-
set(HELLOIMGUI_USE_FREETYPE_PLUTOSVG OFF)
15+
option(HELLOIMGUI_USE_FREETYPE "" OFF)
16+
option(HELLOIMGUI_USE_FREETYPE_PLUTOSVG "" OFF)
1617
set(HELLOIMGUI_USE_SDL2 OFF)
1718
set(HELLOIMGUI_USE_GLFW3 ON)
1819
set(HELLOIMGUI_HAS_VULKAN OFF)

‎desktop/Makefile

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
1-
FLAGS := -DCMAKE_BUILD_TYPE=Release
1+
#FLAGS := -DCMAKE_BUILD_TYPE=Release
2+
#FLAGS += -DFUDGE_CREATE_APPIMAGE
23

34
b:
45
cmake $(FLAGS) -G Ninja -B build
5-
cmake --build build
66

77
convert:
88
cmake --build build && build/fudge --raw /home/daniel/Pictures/xt30-demo/DSCF2043.RAF /home/daniel/Pictures/xt30-demo/output.jpg /home/daniel/Documents/fudge/lib/fp/fp1/Street.FP1
99

1010
bw:
1111
cmake -DCMAKE_TOOLCHAIN_FILE=/home/$$USER/dotfiles/mingw.cmake -G Ninja -B build_win
12-
cmake --build build_win
1312

1413
bx:
1514
@echo "Toolchain file /home/$$USER/dotfiles/osx.cmake"
1615
cmake -DFUDGE_CREATE_MAC_APP=ON -DCMAKE_TOOLCHAIN_FILE=/home/$$USER/dotfiles/osx.cmake -G Ninja -B build_osx
17-
cmake --build build_osx
1816

1917
release:
2018
cmake -DFUDGE_CREATE_APPIMAGE=ON -G Ninja -B build
2119
cmake -DCMAKE_TOOLCHAIN_FILE=/home/$$USER/dotfiles/mingw.cmake -G Ninja -B build_win
2220
cmake -DFUDGE_CREATE_MAC_APP=ON -DCMAKE_TOOLCHAIN_FILE=/home/$$USER/dotfiles/osx.cmake -G Ninja -B build_osx
2321

2422
clean:
25-
rm -rf build_osx build_win build *.ini *.dat
23+
rm -rf build_osx build_win build *.ini *.dat Thumbs.db* *.jpg *.DAT

‎desktop/backend.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <stdio.h>
22
#include <stdint.h>
33
#include <stdlib.h>
4-
#include <camlib.h>
4+
#include <libpict.h>
55
#include <fuji.h>
66
#include <app.h>
77
#include <fujiptp.h>

‎desktop/ci.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <stdio.h>
22
#include <stdint.h>
33
#include <stdlib.h>
4-
#include <camlib.h>
4+
#include <libpict.h>
55
#include <fuji.h>
66
#include <app.h>
77
#include <fujiptp.h>

‎desktop/im.h

+7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
// I have some future plans with this API I want to try.
33
#ifndef IM_H
44
#define IM_H
5+
6+
struct NimModifier {
7+
void (*padding)(int, int);
8+
void (*margin)(int, int);
9+
void (*color)(int, int);
10+
};
11+
512
int im_push_disabled(void);
613
int im_pop_disabled(void);
714

‎desktop/jank.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <poll.h>
1313
#include <arpa/inet.h>
1414
#endif
15-
#include <camlib.h>
15+
#include <libpict.h>
1616
#include <fuji.h>
1717
#include <app.h>
1818
#include <fujiptp.h>

‎desktop/main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//#else
1010
// #include <arpa/inet.h>
1111
//#endif
12-
#include <camlib.h>
12+
#include <libpict.h>
1313
#include <cl_stuff.h>
1414
#include <fuji.h>
1515
#include <app.h>

‎desktop/test.bat

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
build_win\fudge --raw "C:\Users\brikb\Desktop\DSCF2911.RAF" output.jpg "C:\Users\brikb\Desktop\DSCF3010.FP2"

‎desktop/test.lua

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
print(fuji.test())
1+
x = ptp.getDeviceInfo()
2+
print("You are connected to a " .. x["model"])

‎lib/app.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#ifndef APP_H
55
#define APP_H
66

7-
#include <camlib.h>
7+
#include <libpict.h>
88

99
/// @brief Send current camera name to UI
1010
void app_send_cam_name(const char *name);

‎lib/data.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <stdlib.h>
44
#include <errno.h>
55
#include <string.h>
6-
#include <camlib.h>
6+
#include <libpict.h>
77
#include "app.h"
88
#include "fuji.h"
99
#include "fujiptp.h"

‎lib/fuji.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <errno.h>
66
#include <string.h>
77
#include <time.h>
8-
#include <camlib.h>
8+
#include <libpict.h>
99
#include <sys/stat.h>
1010
#include "app.h"
1111
#include "fuji.h"

‎lib/fuji.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Fudge implementations and app logic
33
#ifndef FUJIAPP_FUJI_H
44
#define FUJIAPP_FUJI_H
5-
#include <camlib.h>
5+
#include <libpict.h>
66
#include "fujiptp.h"
77
#include "app.h"
88

‎lib/fuji_lua.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <lua.h>
66
#include <lualib.h>
77
#include <lauxlib.h>
8-
#include <camlib.h>
8+
#include <libpict.h>
99
#include <fujiptp.h>
1010
#include "fuji_lua.h"
1111

‎lib/fuji_usb.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <stdlib.h>
55
#include <errno.h>
66
#include <string.h>
7-
#include <camlib.h>
7+
#include <libpict.h>
88
#include "app.h"
99
#include "fuji.h"
1010
#include "fujiptp.h"

‎lib/libpict

‎lib/lua_runtime.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <lua.h>
55
#include <lualib.h>
66
#include <lauxlib.h>
7-
#include <camlib.h>
7+
#include <libpict.h>
88
#include <app.h>
99
#include "fuji_lua.h"
1010

‎lib/net.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// Generic portable camlib PTP/IP backend
1+
// Generic portable libpict PTP/IP backend
22
// There shouldn't be any Fuji-specific code here, so this file can be copied to a different project.
3-
// Copyright 2024 by Daniel C (https://github.com/petabyt/camlib)
3+
// Copyright 2024 by Daniel C (https://github.com/petabyt/libpict)
44
#include <stdio.h>
55
#include <stdlib.h>
66
#include <string.h>
@@ -19,7 +19,7 @@
1919
#include <arpa/inet.h>
2020
#endif
2121
#include <time.h>
22-
#include <camlib.h>
22+
#include <libpict.h>
2323
#include "app.h"
2424
#include "fuji.h"
2525

‎lib/object.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
// Camlib Object service
1+
// libpict Object service
22
// This is mainly for file tables
33
#include <stdlib.h>
4-
#include <camlib.h>
4+
#include <libpict.h>
55
#include <string.h>
66
#include <pthread.h>
77
#include "object.h"

‎lib/object.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#ifndef OBJECT_H
44
#define OBJECT_H
55

6-
#include <camlib.h>
6+
#include <libpict.h>
77

88
enum PtpSortBy {
99
PTP_SORT_BY_OLDEST = 1,

‎lib/tester.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <stdlib.h>
55
#include <errno.h>
66
#include <string.h>
7-
#include <camlib.h>
7+
#include <libpict.h>
88
#include "app.h"
99
#include "fuji.h"
1010
#include "fujiptp.h"

0 commit comments

Comments
 (0)