diff --git a/projects/CodeBlocks/README.md b/projects/CodeBlocks/README.md
index 92abfded2..c97923611 100644
--- a/projects/CodeBlocks/README.md
+++ b/projects/CodeBlocks/README.md
@@ -1,17 +1,22 @@
-# Raylib template for Code::Blocks
-
-1. Install Raylib.  On Windows you must install the 'Windows Installer (with MinGW compiler)' package.  On other
-platforms you can install however you like.
-
-2. Windows only: In Code::Blocks, select `Settings` `Compiler` `Toolchain executables`.
-Change `Compiler's instrallation directory` to `C:\raylib\MingGW`.  Do *not* press auto-detect.  There is a screenshot 
-below showing how it should look.  Press `OK`.
-
-3. Select `File` `Open` and open the `core_basic_windows.cbp` file.
-
-
-
-![Compiler Settings](compiler_settings.png)
-**by D3nX**
-
+# Raylib template for Code::Blocks
+
+1. Install Raylib.  On Windows you must install the 'Windows Installer (with MinGW compiler)' package.  On other
+platforms you can install however you like following the instructions in the wiki.
+    * https://github.com/raysan5/raylib/releases/download/3.7.0/raylib_installer_v370.mingw.exe
+    * https://github.com/raysan5/raylib/wiki/Working-on-GNU-Linux
+    * https://github.com/raysan5/raylib/wiki/Working-on-macOS
+
+2. Install and run Code::Blocks.
+
+3. Windows only: Select `Settings` `Compiler` `Toolchain executables`.
+Change `Compiler's instrallation directory` to `C:\raylib\MingGW`.  Do *not* press auto-detect.  There is a screenshot 
+below showing how it should look.  Press `OK`.
+
+4. Select `File` `Open` and open the `core_basic_windows.cbp` file.
+
+
+
+![Compiler Settings](compiler_settings.png)
+**screenshot by D3nX**
+
 See also https://github.com/electronstudio/raylib-game-template-codeblocks
\ No newline at end of file
diff --git a/projects/CodeBlocks/core_basic_window.cbp b/projects/CodeBlocks/core_basic_window.cbp
index ce53c60d9..ab9fe58a1 100644
--- a/projects/CodeBlocks/core_basic_window.cbp
+++ b/projects/CodeBlocks/core_basic_window.cbp
@@ -7,8 +7,47 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="Debug">
-				<Option platforms="Unix;Mac;" />
+			<Target title="Debug (Mac)">
+				<Option platforms="Mac;" />
+				<Option output="bin/Debug/raylib-game-template" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="." />
+				<Option object_output="obj/Debug/" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-g" />
+				</Compiler>
+				<Linker>
+					<Add library="raylib" />
+	                <Add option="-framework OpenGL" />
+	                <Add option="-framework Cocoa" />
+	                <Add option="-framework IOKit" />
+	                <Add option="-framework CoreAudio" />
+	                <Add option="-framework CoreVideo" />
+				</Linker>
+			</Target>
+			<Target title="Release (Mac)">
+				<Option platforms="Mac;" />
+				<Option output="bin/Release/raylib-game-template" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="." />
+				<Option object_output="obj/Release/" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-O2" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+					<Add library="raylib" />
+	                <Add option="-framework OpenGL" />
+	                <Add option="-framework Cocoa" />
+	                <Add option="-framework IOKit" />
+	                <Add option="-framework CoreAudio" />
+	                <Add option="-framework CoreVideo" />
+				</Linker>
+			</Target>
+			<Target title="Debug (Linux)">
+				<Option platforms="Unix;" />
 				<Option output="bin/Debug/raylib-game-template" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="." />
 				<Option object_output="obj/Debug/" />
@@ -27,8 +66,8 @@
 					<Add library="X11" />
 				</Linker>
 			</Target>
-			<Target title="Release">
-				<Option platforms="Unix;Mac;" />
+			<Target title="Release (Linux)">
+				<Option platforms="Unix;" />
 				<Option output="bin/Release/raylib-game-template" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="." />
 				<Option object_output="obj/Release/" />
@@ -48,7 +87,7 @@
 					<Add library="X11" />
 				</Linker>
 			</Target>
-			<Target title="Debug (windows)">
+			<Target title="Debug (Windows)">
 				<Option platforms="Windows;" />
 				<Option output="bin/Debug/raylib-game-template" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="." />
@@ -67,7 +106,7 @@
 					<Add library="pthread" />
 				</Linker>
 			</Target>
-			<Target title="Release (windows)">
+			<Target title="Release (Windows)">
 				<Option platforms="Windows;" />
 				<Option output="bin/Release/raylib-game-template" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="." />