diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index c90a00d7..d25b9d7c 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -215,8 +215,13 @@ endif (NOT QT_QTMULTIMEDIA_FOUND)
 FIND_PACKAGE(Protobuf REQUIRED)
 FIND_PACKAGE(Threads)
 
-set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -O0")
-set(CMAKE_CXX_FLAGS_RELEASE "-s -O2")
+IF (CMAKE_COMPILER_IS_GNUCC)
+  set(CMAKE_CXX_FLAGS_RELEASE "-s -O2")
+  set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -O0")
+ELSE (CMAKE_COMPILER_IS_GNUCC)
+  set(CMAKE_CXX_FLAGS_RELEASE "-O2")
+  set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
+ENDIF (CMAKE_COMPILER_IS_GNUCC)
 
 # paths
 set(ICONDIR share/icons CACHE STRING "icon dir")
diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt
index 41338903..6f4e18c9 100644
--- a/oracle/CMakeLists.txt
+++ b/oracle/CMakeLists.txt
@@ -13,7 +13,13 @@ SET(QT_USE_QTSVG TRUE)
 FIND_PACKAGE(Qt4 REQUIRED)
 
 set(CMAKE_BUILD_TYPE Release)
-set(CMAKE_CXX_FLAGS_RELEASE "-s -O2")
+IF (CMAKE_COMPILER_IS_GNUCC)
+  set(CMAKE_CXX_FLAGS_RELEASE "-s -O2")
+  set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -O0")
+ELSE (CMAKE_COMPILER_IS_GNUCC)
+  set(CMAKE_CXX_FLAGS_RELEASE "-O2")
+  set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
+ENDIF (CMAKE_COMPILER_IS_GNUCC)
 
 QT4_WRAP_CPP(oracle_HEADERS_MOC ${oracle_HEADERS})
 INCLUDE(${QT_USE_FILE})