Fixed the windows version

abcucberkeley · Feb 6, 2024 · 13cbb18 · 13cbb18
1 parent 99181cd
commit 13cbb18
Show file tree

Hide file tree

Showing 33 changed files with 5 additions and 3 deletions.
diff --git a/PRTC/libpReadTiffC.dll b/PRTC/libpReadTiffC.dll
diff --git a/PRTC/pReadTiffC.dll b/PRTC/pReadTiffC.dll
diff --git a/PRTC/testGccWin.txt b/PRTC/testGccWin.txt
@@ -1 +1 @@
-gcc -O3 -fopenmp -fPIC -DPIC PRTC.c parallelReadTiff.c -I"C:\jdk-19\include" -I"C:\jdk-19\include\win32" -I"C:\Program Files (x86)\tiff\include" -L"C:\Program Files (x86)\tiff\lib" -shared -static -o pReadTiffC.dll -ltiff
+g++ -O3 -fopenmp -fPIC -DPIC PRTC.cpp -I"C:\jdk-19\include" -I"C:\jdk-19\include\win32" -I"C:\Program Files (x86)\cpp-tiff\include" -L"C:\Program Files (x86)\cpp-tiff\bin" -shared -o libpReadTiffC.dll -lcppTiff -static-libgcc -static-libstdc++
diff --git a/PRZC/gccWindows.txt b/PRZC/gccWindows.txt
@@ -0,0 +1 @@
+g++ -O3 -fopenmp -fPIC -DPIC PRZC.cpp -I"C:\jdk-19\include" -I"C:\jdk-19\include\win32" -I"C:\Program Files (x86)\cpp-zarr\include" -L"C:\Program Files (x86)\cpp-zarr\bin" -shared -o libpReadZarrC.dll -lcppZarr -static-libgcc -static-libstdc++
diff --git a/PRZC/libpReadZarrC.dll b/PRZC/libpReadZarrC.dll
diff --git a/PWTC/gccWindows.txt b/PWTC/gccWindows.txt
@@ -0,0 +1 @@
+g++ -O3 -fopenmp -fPIC -DPIC PWTC.cpp -I"C:\jdk-19\include" -I"C:\jdk-19\include\win32" -I"C:\Program Files (x86)\cpp-tiff\include" -L"C:\Program Files (x86)\cpp-tiff\bin" -shared -o libpWriteTiffC.dll -lcppTiff -static-libgcc -static-libstdc++
diff --git a/PWTC/libpWriteTiffC.dll b/PWTC/libpWriteTiffC.dll
diff --git a/PWZC/libpWriteZarrC.dll b/PWZC/libpWriteZarrC.dll
diff --git a/PWZC/windowsGcc.txt b/PWZC/windowsGcc.txt
@@ -1 +1 @@
-gcc  -fopenmp -O3 -DNDEBUG -fPIC -DPIC PWZC.c parallelWriteZarr.c helperFunctions.c parallelReadZarr.c  -I"C:\jdk-19\include" -I"C:\jdk-19\include\win32" -I"C:\Users\mrmmu\Desktop\ptrFijiPlugin\blosc\include" -I"C:\Users\mrmmu\Desktop\ptrFijiPlugin\bloscZarr\include"  -I"C:\Users\mrmmu\Desktop\ptrFijiPlugin\cJSON\include" -L"C:\Users\mrmmu\Desktop\ptrFijiPlugin\bloscZarr\lib" -L"C:\Users\mrmmu\Desktop\ptrFijiPlugin\blosc\lib" -L"C:\Users\mrmmu\Desktop\ptrFijiPlugin\cJSON\lib" -shared -static -o libpWriteZarrC.dll -llibblosc2 -lblosc -lcjson -lz
+g++ -O3 -fopenmp -fPIC -DPIC PWZC.cpp -I"C:\jdk-19\include" -I"C:\jdk-19\include\win32" -I"C:\Program Files (x86)\cpp-zarr\include" -L"C:\Program Files (x86)\cpp-zarr\bin" -shared -o libpWriteZarrC.dll -lcppZarr -static-libgcc -static-libstdc++
diff --git a/Parallel_Fiji_Visualizer/src/main/java/edu/abc/berkeley/helperFunctions.java b/Parallel_Fiji_Visualizer/src/main/java/edu/abc/berkeley/helperFunctions.java
@@ -17,7 +17,7 @@ public static void loadLib(String libName) {
 		String[] paths = jLP.split(delim);
 		String pathToLib = "";
 		for(String path : paths) {
-			if((path.contains(File.separator+"Parallel_Fiji_Visualizer_lib"))) {
+			if((path.contains("Parallel_Fiji_Visualizer_lib"))) {
 				pathToLib = path;
 				break;
 			}

diff --git a/linux/Parallel_Fiji_Visualizer_plugin/Parallel_Fiji_Visualizer-1.2.0.jar b/linux/Parallel_Fiji_Visualizer_plugin/Parallel_Fiji_Visualizer-1.2.0.jar
diff --git a/...plugin/Parallel_Fiji_Visualizer-1.1.1.jar → ...plugin/Parallel_Fiji_Visualizer-1.2.0.jar b/...plugin/Parallel_Fiji_Visualizer-1.1.1.jar → ...plugin/Parallel_Fiji_Visualizer-1.2.0.jar
diff --git a/windows/Parallel_Fiji_Visualizer_lib/concrt140.dll b/windows/Parallel_Fiji_Visualizer_lib/concrt140.dll
diff --git a/windows/Parallel_Fiji_Visualizer_lib/deflate.dll b/windows/Parallel_Fiji_Visualizer_lib/deflate.dll
diff --git a/windows/Parallel_Fiji_Visualizer_lib/libcppTiff.dll b/windows/Parallel_Fiji_Visualizer_lib/libcppTiff.dll
diff --git a/windows/Parallel_Fiji_Visualizer_lib/libcppZarr.dll b/windows/Parallel_Fiji_Visualizer_lib/libcppZarr.dll
diff --git a/windows/Parallel_Fiji_Visualizer_lib/libdeflate.dll b/windows/Parallel_Fiji_Visualizer_lib/libdeflate.dll
diff --git a/windows/Parallel_Fiji_Visualizer_lib/libgcc_s_seh-1.dll b/windows/Parallel_Fiji_Visualizer_lib/libgcc_s_seh-1.dll
diff --git a/windows/Parallel_Fiji_Visualizer_lib/libpReadTiffC.dll b/windows/Parallel_Fiji_Visualizer_lib/libpReadTiffC.dll
diff --git a/windows/Parallel_Fiji_Visualizer_lib/libpReadZarrC.dll b/windows/Parallel_Fiji_Visualizer_lib/libpReadZarrC.dll
diff --git a/windows/Parallel_Fiji_Visualizer_lib/libpWriteTiffC.dll b/windows/Parallel_Fiji_Visualizer_lib/libpWriteTiffC.dll
diff --git a/windows/Parallel_Fiji_Visualizer_lib/libpWriteZarrC.dll b/windows/Parallel_Fiji_Visualizer_lib/libpWriteZarrC.dll
diff --git a/windows/Parallel_Fiji_Visualizer_lib/libtiff.dll b/windows/Parallel_Fiji_Visualizer_lib/libtiff.dll
diff --git a/windows/Parallel_Fiji_Visualizer_lib/libzlib.dll b/windows/Parallel_Fiji_Visualizer_lib/libzlib.dll
diff --git a/windows/Parallel_Fiji_Visualizer_lib/libzstd.dll b/windows/Parallel_Fiji_Visualizer_lib/libzstd.dll
diff --git a/windows/Parallel_Fiji_Visualizer_lib/msvcp140.dll b/windows/Parallel_Fiji_Visualizer_lib/msvcp140.dll
diff --git a/windows/Parallel_Fiji_Visualizer_lib/msvcp140_1.dll b/windows/Parallel_Fiji_Visualizer_lib/msvcp140_1.dll
diff --git a/windows/Parallel_Fiji_Visualizer_lib/msvcp140_2.dll b/windows/Parallel_Fiji_Visualizer_lib/msvcp140_2.dll
diff --git a/windows/Parallel_Fiji_Visualizer_lib/msvcp140_atomic_wait.dll b/windows/Parallel_Fiji_Visualizer_lib/msvcp140_atomic_wait.dll
diff --git a/windows/Parallel_Fiji_Visualizer_lib/msvcp140_codecvt_ids.dll b/windows/Parallel_Fiji_Visualizer_lib/msvcp140_codecvt_ids.dll
diff --git a/windows/Parallel_Fiji_Visualizer_lib/vcruntime140.dll b/windows/Parallel_Fiji_Visualizer_lib/vcruntime140.dll
diff --git a/windows/Parallel_Fiji_Visualizer_lib/vcruntime140_1.dll b/windows/Parallel_Fiji_Visualizer_lib/vcruntime140_1.dll
diff --git a/windows/Parallel_Fiji_Visualizer_plugin/Parallel_Fiji_Visualizer-1.2.0.jar b/windows/Parallel_Fiji_Visualizer_plugin/Parallel_Fiji_Visualizer-1.2.0.jar
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		gcc -O3 -fopenmp -fPIC -DPIC PRTC.c parallelReadTiff.c -I"C:\jdk-19\include" -I"C:\jdk-19\include\win32" -I"C:\Program Files (x86)\tiff\include" -L"C:\Program Files (x86)\tiff\lib" -shared -static -o pReadTiffC.dll -ltiff
		g++ -O3 -fopenmp -fPIC -DPIC PRTC.cpp -I"C:\jdk-19\include" -I"C:\jdk-19\include\win32" -I"C:\Program Files (x86)\cpp-tiff\include" -L"C:\Program Files (x86)\cpp-tiff\bin" -shared -o libpReadTiffC.dll -lcppTiff -static-libgcc -static-libstdc++
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		g++ -O3 -fopenmp -fPIC -DPIC PRZC.cpp -I"C:\jdk-19\include" -I"C:\jdk-19\include\win32" -I"C:\Program Files (x86)\cpp-zarr\include" -L"C:\Program Files (x86)\cpp-zarr\bin" -shared -o libpReadZarrC.dll -lcppZarr -static-libgcc -static-libstdc++
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		g++ -O3 -fopenmp -fPIC -DPIC PWTC.cpp -I"C:\jdk-19\include" -I"C:\jdk-19\include\win32" -I"C:\Program Files (x86)\cpp-tiff\include" -L"C:\Program Files (x86)\cpp-tiff\bin" -shared -o libpWriteTiffC.dll -lcppTiff -static-libgcc -static-libstdc++
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		gcc -fopenmp -O3 -DNDEBUG -fPIC -DPIC PWZC.c parallelWriteZarr.c helperFunctions.c parallelReadZarr.c -I"C:\jdk-19\include" -I"C:\jdk-19\include\win32" -I"C:\Users\mrmmu\Desktop\ptrFijiPlugin\blosc\include" -I"C:\Users\mrmmu\Desktop\ptrFijiPlugin\bloscZarr\include" -I"C:\Users\mrmmu\Desktop\ptrFijiPlugin\cJSON\include" -L"C:\Users\mrmmu\Desktop\ptrFijiPlugin\bloscZarr\lib" -L"C:\Users\mrmmu\Desktop\ptrFijiPlugin\blosc\lib" -L"C:\Users\mrmmu\Desktop\ptrFijiPlugin\cJSON\lib" -shared -static -o libpWriteZarrC.dll -llibblosc2 -lblosc -lcjson -lz
		g++ -O3 -fopenmp -fPIC -DPIC PWZC.cpp -I"C:\jdk-19\include" -I"C:\jdk-19\include\win32" -I"C:\Program Files (x86)\cpp-zarr\include" -L"C:\Program Files (x86)\cpp-zarr\bin" -shared -o libpWriteZarrC.dll -lcppZarr -static-libgcc -static-libstdc++