Permalink
Browse files

OSX fix PCH fix.

* OSX needs a path to the PCH header, added full path to PCH.
* Updated pchsource to be the same as for header.
  • Loading branch information...
1 parent a94bae5 commit 7dd8987e1895d9ee145d9857de4d9a1f3d8abaf2 @Arelius Arelius committed May 2, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 Helium.lua
View
@@ -442,8 +442,8 @@ Helium.DoModuleProjectSettings = function( baseDirectory, tokenPrefix, moduleNam
"HELIUM_MODULE_HEAP_FUNCTION=Get" .. moduleName .. "DefaultHeap"
}
- pchheader( moduleName .. "Pch.h" )
- pchsource( baseDirectory .. "/" .. moduleName .. "/" .. moduleName .. "Pch.cpp" )
+ pchheader( path.join(os.getcwd(), moduleName .. "/" .. moduleName .. "Pch.h") )
+ pchsource( path.join(os.getcwd(), moduleName .. "/" .. moduleName .. "Pch.cpp") )
Helium.DoDefaultProjectSettings()

7 comments on commit 7dd8987

Owner

gorlak replied May 6, 2012

why do we prefer cwd over baseDirectory here? are they different paths?

Owner

gorlak replied May 6, 2012

Hrm I wonder if I ping @Arelius if he will get a notification.

Contributor

Arelius replied May 10, 2012

I actually got the first notification... Anyways we prefer cwd because baseDirectory is "." which is wrong on osX due to where the xcodeproj files are put or something weird like that.

Owner

gorlak replied May 10, 2012

Aw crap then I will have to put it back...

Contributor

Arelius replied May 10, 2012

Perhaps it'd be ideal to make baseDirectory actually a full path?

Owner

gorlak replied May 12, 2012

So is whats happening here is that XCode doesn't resolve relative paths from the actual premake4.lua location (the root of the repo)? We need to direct a fully qualified path into the premake config to have it have the file path correct? I wonder if this is really a premake bug?

Contributor

Arelius replied May 14, 2012

I'd like to do a little research and find out if it's just a problem in regards to the PCHHeader locations, or most operations. if the later, it may make sense to move the macosx condition to a more root location and fixup basedirectory.

Please sign in to comment.