Merge pull request #2 from billyquith/master

Fixes for OSX.
garrynewman · Feb 9, 2013 · 89c3f83 · 89c3f83
2 parents 7ea8682 + a4150e4
commit 89c3f83
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/projects/premake4.lua b/projects/premake4.lua
@@ -5,36 +5,36 @@ solution "Bootil"
 	flags { "Symbols", "NoEditAndContinue", "NoPCH", "StaticRuntime", "EnableSSE" }
 	targetdir ( "../lib/" .. os.get() .. "/" .. _ACTION )
 	includedirs { "../include/", "../src/3rdParty/" }
-	
+
 	if os.is( "linux" ) or os.is( "macosx" ) then
 		buildoptions { "-fPIC" }
-		linkoptions  { "-fPIC" }
+		-- linkoptions  { "-fPIC" }  -- OSX does not need this for linking
 	end
 
 	configurations
-	{ 
+	{
 		"Release",
 		"Debug"
 	}
-	
+
 configuration "Release"
 	defines { "NDEBUG" }
 	flags{ "OptimizeSpeed", "FloatFast" }
-	
+
 configuration "Debug"
 	defines { "_DEBUG" }
 	targetsuffix "_debug"
 
-project "Shared Library"
+project "Bootil-Shared"
 	uuid ( "22348F3E-2CE7-42fd-B7DC-2861A17D9FEE" )
 	defines { "BOOTIL_COMPILE_DLL" }
 	files { "../src/**.*", "../include/**.*" }
 	kind "SharedLib"
 	targetname( "bootil" )
 
-project "Static Library"
+project "Bootil-Static"
 	uuid ( "AB8E7B19-A70C-4767-88DE-F02160167C2E" )
 	defines { "BOOTIL_COMPILE_STATIC" }
 	files { "../src/**.*", "../include/**.*" }
 	kind "StaticLib"
-	targetname( "bootil_static" )
+	targetname( "bootil_static" )
diff --git a/src/Bootil/Threads/Mutex.cpp b/src/Bootil/Threads/Mutex.cpp
@@ -1,4 +1,4 @@
-#pragma once
+
 #include "Bootil/Bootil.h"
 #include "tinythreadpp/fast_mutex.h"
 

diff --git a/src/Bootil/Threads/Thread.cpp b/src/Bootil/Threads/Thread.cpp
@@ -1,4 +1,4 @@
-#pragma once
+
 #include "Bootil/Bootil.h"
 #include "tinythreadpp/tinythread.h"
 #include "tinythreadpp/fast_mutex.h"

diff --git a/src/Bootil/Threads/Utility.cpp b/src/Bootil/Threads/Utility.cpp
@@ -1,4 +1,4 @@
-#pragma once
+
 #include "Bootil/Bootil.h"
 
 #ifdef _WIN32