@@ -50,22 +50,31 @@ jobs:
5050 ls -la | grep -E "ccap" || echo "No ccap libraries found"
5151
5252 # Verify library type
53+ # Debug versions have 'd' suffix, Release versions don't
54+ if [ "${{ matrix.config }}" = "Debug" ]; then
55+ LIB_BASENAME="ccapd"
56+ DLL_NAME="ccapd.dll"
57+ else
58+ LIB_BASENAME="ccap"
59+ DLL_NAME="ccap.dll"
60+ fi
61+
5362 if [ "${{ matrix.library_type }}" = "shared" ]; then
54- if [ -f "ccap.dll " ]; then
55- echo "✓ Windows shared library ccap.dll successfully built"
63+ if [ -f "$DLL_NAME " ]; then
64+ echo "✓ Windows shared library $DLL_NAME successfully built"
5665 # Check if import library exists
57- if [ -f "ccap .lib" ]; then
58- echo "✓ Windows import library ccap .lib also created"
66+ if [ -f "${LIB_BASENAME} .lib" ]; then
67+ echo "✓ Windows import library ${LIB_BASENAME} .lib also created"
5968 fi
6069 else
61- echo "✗ Windows shared library not found"
70+ echo "✗ Windows shared library $DLL_NAME not found"
6271 exit 1
6372 fi
6473 else
65- if [ -f "ccap .lib" ]; then
66- echo "✓ Windows static library ccap .lib successfully built"
74+ if [ -f "${LIB_BASENAME} .lib" ]; then
75+ echo "✓ Windows static library ${LIB_BASENAME} .lib successfully built"
6776 else
68- echo "✗ Windows static library not found"
77+ echo "✗ Windows static library ${LIB_BASENAME}.lib not found"
6978 exit 1
7079 fi
7180 fi
@@ -105,11 +114,20 @@ jobs:
105114 # Convert path for cmd
106115 VCVARS_WIN_PATH=$(echo "$VCVARS_PATH" | sed 's|/c/|C:/|g' | sed 's|/|\\|g')
107116
117+ # Determine library names based on config
118+ if [ "${{ matrix.config }}" = "Debug" ]; then
119+ LIB_NAME="ccapd.lib"
120+ DLL_NAME="ccapd.dll"
121+ else
122+ LIB_NAME="ccap.lib"
123+ DLL_NAME="ccap.dll"
124+ fi
125+
108126 # Compile with Visual Studio
109- cmd //c "\"$VCVARS_WIN_PATH\" && cl /I..\\..\\include test_shared.cpp ccap.lib /Fe:test_shared.exe"
127+ cmd //c "\"$VCVARS_WIN_PATH\" && cl /I..\\..\\include test_shared.cpp $LIB_NAME /Fe:test_shared.exe"
110128
111129 # Copy DLL to current directory and run
112- cp ccap.dll .
130+ cp "$DLL_NAME" .
113131 ./test_shared.exe
114132 echo "✓ Windows shared library linking test passed"
115133 else
@@ -145,7 +163,7 @@ jobs:
145163 with :
146164 name : ccap-windows-${{ matrix.config }}-${{ matrix.library_type }}
147165 path : |
148- build/${{ matrix.config }}-${{ matrix.library_type }}/${{ matrix.config }}/ccap.*
166+ build/${{ matrix.config }}-${{ matrix.library_type }}/${{ matrix.config }}/ccap* .*
149167 build/${{ matrix.config }}-${{ matrix.library_type }}/${{ matrix.config }}/0-print_camera.exe
150168 build/${{ matrix.config }}-${{ matrix.library_type }}/${{ matrix.config }}/1-minimal_example.exe
151169 build/${{ matrix.config }}-${{ matrix.library_type }}/${{ matrix.config }}/2-capture_grab.exe
0 commit comments