Global make file

ujh · Dec 27, 2023 · fc18eeb · fc18eeb
1 parent 60d2a5f
commit fc18eeb
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 35 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,42 +7,22 @@ on:
     branches: [ "main" ]
 
 jobs:
-  build-engine:
+  build:
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: true
     - name: build
-      run: cd engine && make enginetest
+      run: make
 
-  test-engine:
+  test:
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v4
-    - name: build
-      run: cd engine && make test
-
-  build-initial-population:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: build
-      run: cd initial-population && make
-
-  build-evolve:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: build
-      run: cd evolve && make
-
-  test-evolve:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: build
-      run: cd evolve && make test
+      with:
+        submodules: true
+  - name: test
+      run: make test
diff --git a/Makefile b/Makefile
@@ -0,0 +1,18 @@
+all: pcg
+	cd engine; $(MAKE)
+	cd initial-population; $(MAKE)
+	cd evolve; $(MAKE)
+
+clean:
+	cd engine; $(MAKE) clean
+	cd initial-population; $(MAKE) clean
+	cd evolve; $(MAKE) clean
+	cd pcg-c/src; $(MAKE) clean
+
+test: pcg
+	cd engine; $(MAKE) enginetest
+	cd engine; $(MAKE) test
+	cd evolve; $(MAKE) test
+
+pcg:
+	cd pcg-c/src; $(MAKE)
diff --git a/engine/Makefile b/engine/Makefile
@@ -1,5 +1,5 @@
-CFLAGS = -Wall -Wshadow -O3 -g -march=native
-LDLIBS = -lm -lpcg_random
+CFLAGS = -Wall -Wshadow -O3 -g -march=native -I../pcg-c/include
+LDLIBS = -L../pcg-c/src -lm -lpcg_random
 
 OBJS = brown.o gtp.o genann.o generate_move.o interface.o
 

diff --git a/evolve/Makefile b/evolve/Makefile
@@ -1,5 +1,5 @@
-CFLAGS = -Wall -Wshadow -O3 -g -march=native
-LDLIBS = -lm -lpcg_random
+CFLAGS = -Wall -Wshadow -O3 -g -march=native -I../pcg-c/include
+LDLIBS = -L../pcg-c/src -lm -lpcg_random
 
 OBJS = genann.o evolve.o
 

diff --git a/evolve/main.c b/evolve/main.c
@@ -24,6 +24,7 @@ SOFTWARE.
 
 */
 
+#include <math.h>
 #include <stdlib.h>
 
 #include "evolve.h"

diff --git a/initial-population/Makefile b/initial-population/Makefile
@@ -1,5 +1,5 @@
-CFLAGS = -Wall -Wshadow -O3 -g -march=native
-LDLIBS = -lm -lpcg_random
+CFLAGS = -Wall -Wshadow -O3 -g -march=native -I../pcg-c/include
+LDLIBS = -L../pcg-c/src -lm -lpcg_random
 
 OBJS = genann.o