From e405d3da841342a904d89efe914ac970a15f2d90 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 8 Feb 2013 13:54:34 +0000 Subject: [PATCH 1/2] Bootil static library had project name "Static Library". Renamed. --- projects/premake4.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/projects/premake4.lua b/projects/premake4.lua index 88afbb2..b39f124 100644 --- a/projects/premake4.lua +++ b/projects/premake4.lua @@ -25,16 +25,18 @@ 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" ) \ No newline at end of file + targetname( "bootil_static" ) + + \ No newline at end of file From a4150e4361ede2699f97bbf335c80dbd42847fc9 Mon Sep 17 00:00:00 2001 From: BQ Date: Fri, 8 Feb 2013 19:15:18 +0000 Subject: [PATCH 2/2] Fixes for OSX. * Linker doesn't need -fPIC, causes error. * #pragma once in cpp files removed. --- projects/premake4.lua | 14 ++++++-------- src/Bootil/Threads/Mutex.cpp | 2 +- src/Bootil/Threads/Thread.cpp | 2 +- src/Bootil/Threads/Utility.cpp | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/projects/premake4.lua b/projects/premake4.lua index b39f124..32fcfeb 100644 --- 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" ) - - \ No newline at end of file diff --git a/src/Bootil/Threads/Mutex.cpp b/src/Bootil/Threads/Mutex.cpp index 6e64199..11a808c 100644 --- 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 index e2bd639..b69ccfc 100644 --- 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 index 7273ea3..04b094b 100644 --- a/src/Bootil/Threads/Utility.cpp +++ b/src/Bootil/Threads/Utility.cpp @@ -1,4 +1,4 @@ -#pragma once + #include "Bootil/Bootil.h" #ifdef _WIN32