diff --git a/.github/workflows/linux-cpp.yml b/.github/workflows/linux-cpp.yml
index 25dd3a4..932cd0d 100644
--- a/.github/workflows/linux-cpp.yml
+++ b/.github/workflows/linux-cpp.yml
@@ -13,11 +13,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: auto gen
-      run: ./autogen.sh
-    - name: configure
-      run: ./configure
+    - name: Generate Project
+      run: ./build_linux.sh
     - name: make
-      run: make
-    - name: make check
-      run: make check  
+      run: make -C ./proj
diff --git a/.github/workflows/windows-cpp.yml b/.github/workflows/windows-cpp.yml
index 81b38f7..008bfed 100644
--- a/.github/workflows/windows-cpp.yml
+++ b/.github/workflows/windows-cpp.yml
@@ -23,14 +23,6 @@ jobs:
     - name: Setup MSBuild.exe
       uses: microsoft/setup-msbuild@v1.0.2
     
-    - name: Set up Python
-      uses: actions/setup-python@v3
-      with:
-        python-version: '3.x'
-    - name: Install Python3 Distutils
-      run: |
-        python -m pip install --upgrade pip setuptools wheel packaging
-
     - name: Generate Project
       run: ./build_windows.bat
     
diff --git a/README.md b/README.md
index 35092fd..51376b0 100644
--- a/README.md
+++ b/README.md
@@ -11,14 +11,8 @@ Picasso is a high quality vector graphic rendering library. It has high performa
 
 #### linux:
 ```
-1. automake & autoconf
-./autogen.sh
-./configure
-make
-sudo make install;
-
-
-2. gyp build
+1. Install cmake above v3.16 on your system
+2. Build project
 ./build_linux.sh
 cd proj
 make
diff --git a/build_linux.sh b/build_linux.sh
index 1c16832..dfea30a 100755
--- a/build_linux.sh
+++ b/build_linux.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 
-./tools/gyp/gyp --depth=./ picasso.gyp --generator-output=proj
-echo "Please change dir to \"proj\" and type \"make\" or \"make BUILDTYPE=Release\""
+mkdir proj
+cd proj
+#  cmake -DCMAKE_BUILD_TYPE=Release ..
+cmake -DCMAKE_BUILD_TYPE=Debug ..
+
+echo "Please change dir to \"proj\" and type \"make\""
 echo "...\n"		
diff --git a/build_windows.bat b/build_windows.bat
index 4bf4ddc..8a14620 100644
--- a/build_windows.bat
+++ b/build_windows.bat
@@ -1,6 +1,3 @@
-rem set GYP_MSVS_VERSION=2019
-rem ./tools/gyp/gyp --depth=./ picasso.gyp --generator-output=vcproj
-
 mkdir proj
 cd proj
 cmake ../