Fixes for OSX.

* Linker doesn't need -fPIC, causes error. * #pragma once in cpp files removed.
garrynewman · Feb 8, 2013 · 0e90ec7 · 0e90ec7
1 parent e59ab45
commit 0e90ec7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/projects/premake4.lua b/projects/premake4.lua
@@ -5,22 +5,22 @@ 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"
@@ -38,5 +38,3 @@ project "Bootil-Static"
 	files { "../src/**.*", "../include/**.*" }
 	kind "StaticLib"
 	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