update workflow

Update makefiles
Update Makefile.win
2025-04-04 19:53:12 +08:00 · 2025-03-14 22:19:55 +03:00 · 2025-03-14 22:15:47 +03:00 · 2025-03-14 22:13:27 +03:00 · 2025-03-14 22:11:06 +03:00 · 2025-03-14 22:08:16 +03:00
3 changed files with 6 additions and 6 deletions
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@ -29,12 +29,12 @@ jobs:
    - name: ln Mac
      if: ${{ startsWith(matrix.target, 'macos') }}
      run: ln -s Makefile.FreeBSD Makefile
+    - name: dirs Windows
+      if: ${{ startsWith(matrix.target, 'windows') }}
+      run: cmd /C 'echo:>>Makefile.win && echo LIBS := -L "c:/program files/openssl/lib" $(LIBS) >>Makefile.win && echo CFLAGS := -I "c:/program files/openssl/include" $(CFLAGS) >>Makefile.win'
    - name: ln Windows
      if: ${{ startsWith(matrix.target, 'windows') }}
      run: copy Makefile.win Makefile
-    - name: dirs Windows
-      if: ${{ startsWith(matrix.target, 'windows') }}
-      run: cmd /C 'echo LIBS := -L "c:/program files/openssl/lib" $(LIBS) >>Makefile.win && echo CFLAGS := -I "c:/program files/openssl/include" $(CFLAGS) >>Makefile.win && type Makefile.win'
    - name: SSLPlugin Linux
      if: ${{ startsWith(matrix.target, 'ubuntu') }}
      run: 'echo PLUGINS := $(PLUGINS) SSLPlugin >>Makefile & echo LIBS := $(LIBS) -lcrypto -lssl >>Makefile'
--- a/Makefile.llvm
+++ b/Makefile.llvm
@ -34,5 +34,5 @@ PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlu
 include Makefile.inc

 allplugins:
-    @list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ;	cd ../.. ; done
-    
+	@list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ; cd ../.. ; done
+
--- a/Makefile.win
+++ b/Makefile.win
@ -33,5 +33,5 @@ PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlu
 include Makefile.inc

 allplugins:
-    @list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ;  rm *.o ; cd ../.. ; done
+	@list="$(PLUGINS)"; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ; cd ../.. ; done
Author	SHA1	Message	Date
Vladimir Dubrovin	71ca0b7471	update workflow Some checks failed C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled Details C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled Details C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled Details C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled Details	2025-03-14 22:19:55 +03:00
Vladimir Dubrovin	cf3a2778d6	Update makefiles	2025-03-14 22:15:47 +03:00
Vladimir Dubrovin	86081b0f44	Update Makefile.win	2025-03-14 22:13:27 +03:00
Vladimir Dubrovin	52a217056e	Update Makefile.win	2025-03-14 22:11:06 +03:00
Vladimir Dubrovin	c09cc28cbf	Update Makefile.win	2025-03-14 22:08:16 +03:00
Vladimir Dubrovin	0c2a8404b2	Update Makefile.win	2025-03-14 22:05:35 +03:00
Vladimir Dubrovin	6ca40cfb2e	Update Makefile.win	2025-03-14 22:01:07 +03:00
Vladimir Dubrovin	07e97a57ba	Update Makefile.win	2025-03-14 21:58:30 +03:00
Vladimir Dubrovin	065ded7df3	Update Makefile.win	2025-03-14 21:58:11 +03:00
Vladimir Dubrovin	dae86fc6ff	Update Makefile.win	2025-03-14 21:55:59 +03:00
Vladimir Dubrovin	895f5d9128	Update Makefile.win	2025-03-14 21:51:05 +03:00
Vladimir Dubrovin	e26e3727a3	Update c-cpp.yml	2025-03-14 21:48:02 +03:00
Vladimir Dubrovin	9a39a49c07	Update c-cpp.yml	2025-03-14 21:44:53 +03:00
Vladimir Dubrovin	7bf5f1a837	Update c-cpp.yml	2025-03-14 21:42:00 +03:00
Vladimir Dubrovin	ce3f12115a	Update c-cpp.yml	2025-03-14 21:40:36 +03:00
Vladimir Dubrovin	2a97a46301	Update c-cpp.yml	2025-03-14 21:38:18 +03:00
Vladimir Dubrovin	e36d5fe662	Update c-cpp.yml	2025-03-14 21:36:16 +03:00
Vladimir Dubrovin	fb824c9463	Update c-cpp.yml	2025-03-14 21:32:44 +03:00
Vladimir Dubrovin	c295bd9ac3	Update c-cpp.yml	2025-03-14 21:29:31 +03:00
Vladimir Dubrovin	399c360be9	Update c-cpp.yml	2025-03-14 21:27:07 +03:00
Vladimir Dubrovin	de8067c3dc	Update c-cpp.yml	2025-03-14 21:24:52 +03:00
Vladimir Dubrovin	7737ac07db	Update c-cpp.yml	2025-03-14 21:21:42 +03:00
Vladimir Dubrovin	f9a5649dfb	Update Makefile.win	2025-03-14 21:13:13 +03:00
Vladimir Dubrovin	f048f7fa4d	Update Makefile.llvm	2025-03-14 21:04:48 +03:00