diff --git a/project/makefile b/project/makefile
index 93267ea..65ab843 100644
--- a/project/makefile
+++ b/project/makefile
@@ -109,25 +109,20 @@ release:
 	mkdir -p release
 	$(MAKE) main DEBUG=false
 
-release_mac:
-	$(MAKE) main MAC=true DEBUG=false
+release_osx:
+	mkdir -p release
+	$(MAKE) main OSX=true DEBUG=false
 
-debug_mac:
-	$(MAKE) main MAC=true DEBUG=true
+debug_osx:
+	mkdir -p debug
+	$(MAKE) main OSX=true DEBUG=true
 
-all_linux:
-	release debug
+all_linux: release debug
+all_osx: release_osx debug_osx
+all: all_linux all_osx
 
-all_mac:
-	release_mac debug_mac
-
-all:
-	all_linux all_mac
-
-default:
-	all_linux
+default: all
 
 clean:
 	rm -rf release
 	rm -rf debug
-
diff --git a/project/yapb.vcxproj b/project/yapb.vcxproj
index 9de0d83..b8162b2 100644
--- a/project/yapb.vcxproj
+++ b/project/yapb.vcxproj
@@ -41,6 +41,9 @@
   <ItemGroup>
     <ResourceCompile Include="yapb.rc" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="makefile" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{C232645A-3B99-48F4-A1F3-F20CF0A9568B}</ProjectGuid>
     <RootNamespace>yapb</RootNamespace>
diff --git a/project/yapb.vcxproj.filters b/project/yapb.vcxproj.filters
index 9456d00..5c6e46b 100644
--- a/project/yapb.vcxproj.filters
+++ b/project/yapb.vcxproj.filters
@@ -95,4 +95,9 @@
       <Filter>project</Filter>
     </ResourceCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="makefile">
+      <Filter>project</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file