diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 7a1a01c10b..3499e5bead 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -101,14 +101,14 @@ endif(USBnull)
 #endif(xpad)
 
 # make zerogs
-if(zerogs)
-	add_subdirectory(zerogs)
-endif(zerogs)
+#if(zerogs)
+#	add_subdirectory(zerogs)
+#endif(zerogs)
 
 # make zzogl-pg
-#if(zzogl)
-#	add_subdirectory(zzogl-pg)
-#endif(zzogl)
+if(zzogl)
+	add_subdirectory(zzogl-pg)
+endif(zzogl)
 
 # make zeropad
 if(zeropad)
diff --git a/plugins/zzogl-pg/opengl/CMakeLists.txt b/plugins/zzogl-pg/opengl/CMakeLists.txt
index 98103ebbcf..bc157cc0cb 100644
--- a/plugins/zzogl-pg/opengl/CMakeLists.txt
+++ b/plugins/zzogl-pg/opengl/CMakeLists.txt
@@ -19,22 +19,35 @@ set(CMAKE_SHARED_LIBRARY_C_FLAGS "")
 # plugin name
 set(zzoglName zzogl)
 
+set(CommonFlags
+    -pthread
+    -m32
+    -Wno-format
+    -Wno-unused-parameter
+    -Wno-unused-value
+    -Wunused-variable
+    -msse2
+    -fno-regmove
+    -DZEROGS_SSE2
+    )
+
+
 # Debug - Build
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
     # add defines
-    add_definitions(-Wall -m32 -g)
+    add_definitions(${CommonFlags} -g -Wall -D_DEBUG)
 endif(CMAKE_BUILD_TYPE STREQUAL Debug)
 
 # Devel - Build
 if(CMAKE_BUILD_TYPE STREQUAL Devel)
     # add defines
-    add_definitions(-Wall -m32 -O2)
+    add_definitions(${CommonFlags} -g -O2 -W -DZEROGS_DEVBUILD)
 endif(CMAKE_BUILD_TYPE STREQUAL Devel)
 
 # Release - Build
 if(CMAKE_BUILD_TYPE STREQUAL Release)
     # add defines
-    add_definitions(-Wall -m32 -O2 -s)
+    add_definitions(${CommonFlags} -O2 -W -DRELEASE_TO_PUBLIC)
 endif(CMAKE_BUILD_TYPE STREQUAL Release)
 
 # zzogl sources