Skip to content

Commit 0712c3f

Browse files
gorlakgorlak
committed
Update to FBX 2012.2
1 parent 9276feb commit 0712c3f

File tree

5 files changed

+50
-45
lines changed

5 files changed

+50
-45
lines changed

‎EditorSupport/FbxSupport.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -321,11 +321,11 @@ bool FbxSupport::LoadMesh(
321321
LazyInitialize();
322322

323323
// Convert the source file path to a UTF-8 string readable by the FBX SDK.
324+
char* pConvertedFilePath = NULL;
324325
#if HELIUM_UNICODE
325-
KFBX_WIDECHAR_to_UTF8( *rSourceFilePath, pConvertedFilePath );
326+
KFbxWideCharToUTF8( *rSourceFilePath, pConvertedFilePath );
326327
#else
327-
char* pConvertedFilePath = NULL;
328-
KFBX_ANSI_to_UTF8( *rSourceFilePath, pConvertedFilePath );
328+
KFbxAnsiToUTF8( *rSourceFilePath, pConvertedFilePath );
329329
#endif
330330
if( !pConvertedFilePath )
331331
{
@@ -416,11 +416,11 @@ bool FbxSupport::LoadAnimation(
416416
LazyInitialize();
417417

418418
// Convert the source file path to a UTF-8 string readable by the FBX SDK.
419+
char* pConvertedFilePath = NULL;
419420
#if HELIUM_UNICODE
420-
KFBX_WIDECHAR_to_UTF8( *rSourceFilePath, pConvertedFilePath );
421+
KFbxWideCharToUTF8( *rSourceFilePath, pConvertedFilePath );
421422
#else
422-
char* pConvertedFilePath = NULL;
423-
KFBX_ANSI_to_UTF8( *rSourceFilePath, pConvertedFilePath );
423+
KFbxAnsiToUTF8( *rSourceFilePath, pConvertedFilePath );
424424
#endif
425425
if( !pConvertedFilePath )
426426
{

‎FBX.lua

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ Helium.PublishFBX = function( bin )
55
local files = {}
66

77
if os.get() == "windows" then
8-
files[1] = { file="fbxsdk_20113_1.dll", source=Helium.GetFbxSdkLocation() .. "/lib/vs2008", target=bin .. "/x32/Debug" }
9-
files[2] = { file="fbxsdk_20113_1.dll", source=Helium.GetFbxSdkLocation() .. "/lib/vs2008", target=bin .. "/x32/Intermediate" }
10-
files[3] = { file="fbxsdk_20113_1.dll", source=Helium.GetFbxSdkLocation() .. "/lib/vs2008", target=bin .. "/x32/Profile" }
11-
files[4] = { file="fbxsdk_20113_1.dll", source=Helium.GetFbxSdkLocation() .. "/lib/vs2008", target=bin .. "/x32/Release" }
8+
files[1] = { file="fbxsdk-2012.2d.dll", source=Helium.GetFbxSdkLocation() .. "/lib/" .. _ACTION .. "/x86", target=bin .. "/x32/Debug" }
9+
files[2] = { file="fbxsdk-2012.2.dll", source=Helium.GetFbxSdkLocation() .. "/lib/" .. _ACTION .. "/x86", target=bin .. "/x32/Intermediate" }
10+
files[3] = { file="fbxsdk-2012.2.dll", source=Helium.GetFbxSdkLocation() .. "/lib/" .. _ACTION .. "/x86", target=bin .. "/x32/Profile" }
11+
files[4] = { file="fbxsdk-2012.2.dll", source=Helium.GetFbxSdkLocation() .. "/lib/" .. _ACTION .. "/x86", target=bin .. "/x32/Release" }
1212
if Helium.Build64Bit() then
13-
files[5] = { file="fbxsdk_20113_1_amd64.dll", source=Helium.GetFbxSdkLocation() .. "/lib/vs2008", target=bin .. "/x64/Debug" }
14-
files[6] = { file="fbxsdk_20113_1_amd64.dll", source=Helium.GetFbxSdkLocation() .. "/lib/vs2008", target=bin .. "/x64/Intermediate" }
15-
files[7] = { file="fbxsdk_20113_1_amd64.dll", source=Helium.GetFbxSdkLocation() .. "/lib/vs2008", target=bin .. "/x64/Profile" }
16-
files[8] = { file="fbxsdk_20113_1_amd64.dll", source=Helium.GetFbxSdkLocation() .. "/lib/vs2008", target=bin .. "/x64/Release" }
13+
files[5] = { file="fbxsdk-2012.2d.dll", source=Helium.GetFbxSdkLocation() .. "/lib/" .. _ACTION .. "/x64", target=bin .. "/x64/Debug" }
14+
files[6] = { file="fbxsdk-2012.2.dll", source=Helium.GetFbxSdkLocation() .. "/lib/" .. _ACTION .. "/x64", target=bin .. "/x64/Intermediate" }
15+
files[7] = { file="fbxsdk-2012.2.dll", source=Helium.GetFbxSdkLocation() .. "/lib/" .. _ACTION .. "/x64", target=bin .. "/x64/Profile" }
16+
files[8] = { file="fbxsdk-2012.2.dll", source=Helium.GetFbxSdkLocation() .. "/lib/" .. _ACTION .. "/x64", target=bin .. "/x64/Release" }
1717
end
1818
elseif os.get() == "macosx" then
19-
files[1] = { file="libfbxsdk_20113_1d.dylib", source=Helium.GetFbxSdkLocation() .. "/lib/gcc4", target=bin .. "/x32/Debug" }
20-
files[2] = { file="libfbxsdk_20113_1.dylib", source=Helium.GetFbxSdkLocation() .. "/lib/gcc4", target=bin .. "/x32/Intermediate" }
21-
files[3] = { file="libfbxsdk_20113_1.dylib", source=Helium.GetFbxSdkLocation() .. "/lib/gcc4", target=bin .. "/x32/Profile" }
22-
files[4] = { file="libfbxsdk_20113_1.dylib", source=Helium.GetFbxSdkLocation() .. "/lib/gcc4", target=bin .. "/x32/Release" }
19+
files[1] = { file="libfbxsdk-2012.2d.dylib", source=Helium.GetFbxSdkLocation() .. "/lib/gcc4", target=bin .. "/x32/Debug" }
20+
files[2] = { file="libfbxsdk-2012.2.dylib", source=Helium.GetFbxSdkLocation() .. "/lib/gcc4", target=bin .. "/x32/Intermediate" }
21+
files[3] = { file="libfbxsdk-2012.2.dylib", source=Helium.GetFbxSdkLocation() .. "/lib/gcc4", target=bin .. "/x32/Profile" }
22+
files[4] = { file="libfbxsdk-2012.2.dylib", source=Helium.GetFbxSdkLocation() .. "/lib/gcc4", target=bin .. "/x32/Release" }
2323
else
2424
print("Implement support for " .. os.get() .. " to PublishFBX()")
2525
os.exit(1)

‎Helium.lua

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Helium = {}
22

33
Helium.RequiredPremakeVersion = '4.4-beta1'
44
Helium.RequiredCLVersion = 150030729
5-
Helium.RequiredFBXVersion = '2011.3.1'
5+
Helium.RequiredFBXVersion = '2012.2'
66

77
os.capture = function( cmd, raw )
88
local f = assert( io.popen( cmd, 'r' ) )
@@ -38,9 +38,7 @@ Helium.GetFbxSdkLocation = function()
3838
if os.get() == "windows" then
3939
fbxLocation = "C:\\Program Files\\Autodesk\\FBX\\FbxSdk\\" .. Helium.RequiredFBXVersion
4040
elseif os.get() == "macosx" then
41-
if Helium.RequiredFBXVersion == '2011.3.1' then
42-
fbxLocation = "/Applications/Autodesk/FBXSDK20113_1"
43-
end
41+
fbxLocation = "/Applications/Autodesk/FBXSDK" .. Helium.RequiredFBXVersion
4442
else
4543
print("Implement support for " .. os.get() .. " to Helium.GetFbxSdkLocation()")
4644
os.exit(1)
@@ -114,15 +112,10 @@ Helium.CheckEnvironment = function()
114112
local fbxDir = Helium.GetFbxSdkLocation()
115113
if not fbxDir or not os.isdir( fbxDir ) then
116114
print( " -> You must have the FBX SDK installed and the FBX_SDK environment variable set." )
117-
print( " -> Make sure to point the FBX_SDK environment variable at the FBX install location, eg: C:\\Program Files\\Autodesk\\FBX\\FbxSdk\\2011.3.1" )
115+
print( " -> Make sure to point the FBX_SDK environment variable at the FBX install location, eg: C:\\Program Files\\Autodesk\\FBX\\FbxSdk\\" .. Helium.RequiredFBXVersion )
118116
failed = 1
119117
end
120-
121-
if fbxDir and not string.match( fbxDir, '2011\.3\.1$' ) then
122-
print( " -> Currently, Helium only supports version 2011.3.1 of the FBX SDK. Please download that specific version and make sure your FBX_SDK environment variable points to the proper install location." )
123-
failed = 1
124-
end
125-
118+
126119
if failed == 1 then
127120
print( "\nCannot proceed until your environment is valid." )
128121
os.exit( 1 )
@@ -139,6 +132,8 @@ Helium.Publish = function( files )
139132
local exists = os.isfile( path )
140133
local destination = v.target .. "/" .. v.file
141134

135+
print( path )
136+
142137
-- do the hard link
143138
local linkCommand = ''
144139
if ( os.get() == "windows" ) then
@@ -232,7 +227,7 @@ Helium.DoDefaultSolutionSettings = function()
232227
defines
233228
{
234229
"UNICODE=1",
235-
"KFBX_DLLINFO=1",
230+
"FBXSDK_SHARED=1",
236231
"LITESQL_UNICODE=1",
237232
"XML_STATIC=1",
238233
"XML_UNICODE_WCHAR_T=1",
@@ -389,22 +384,21 @@ Helium.DoDefaultProjectSettings = function()
389384
"wininet",
390385
}
391386

392-
configuration { "windows", "Debug", "SharedLib or *App" }
387+
configuration { "windows", "SharedLib or *App" }
393388
links
394389
{
395390
"dbghelp",
396391
}
397392

398-
configuration { "windows", "x32", "SharedLib or *App" }
393+
configuration { "windows", "Debug", "SharedLib or *App" }
399394
links
400395
{
401-
"fbxsdk_20113_1",
396+
"fbxsdk-2012.2d",
402397
}
403-
404-
configuration { "windows", "x64", "SharedLib or *App" }
398+
configuration { "windows", "not Debug", "SharedLib or *App" }
405399
links
406400
{
407-
"fbxsdk_20113_1_amd64",
401+
"fbxsdk-2012.2",
408402
}
409403

410404
if haveGranny then

‎Runtime.lua

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,18 @@ project( prefix .. "TestApp" )-- DEPRECATED
9090
"ws2_32",
9191
"dbghelp",
9292
}
93-
configuration { "windows", "x32" }
93+
94+
configuration { "windows", "Debug" }
9495
links
9596
{
96-
"fbxsdk_20113_1",
97+
"fbxsdk-2012.2d",
9798
}
98-
configuration { "windows", "x64" }
99+
configuration { "windows", "not Debug" }
99100
links
100101
{
101-
"fbxsdk_20113_1_amd64",
102+
"fbxsdk-2012.2",
102103
}
104+
103105
if haveGranny then
104106
configuration "x32"
105107
links
@@ -203,16 +205,18 @@ project( prefix .. "ExampleMain" )
203205
"ws2_32",
204206
"dbghelp",
205207
}
206-
configuration { "windows", "x32" }
208+
209+
configuration { "windows", "Debug" }
207210
links
208211
{
209-
"fbxsdk_20113_1",
212+
"fbxsdk-2012.2d",
210213
}
211-
configuration { "windows", "x64" }
214+
configuration { "windows", "not Debug" }
212215
links
213216
{
214-
"fbxsdk_20113_1_amd64",
217+
"fbxsdk-2012.2",
215218
}
219+
216220
if haveGranny then
217221
configuration "x32"
218222
links

‎Shared.lua

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,16 @@ configuration "windows"
4040
"Dependencies/nvtt/project/vc8",
4141
"Dependencies/wxWidgets/include/msvc",
4242
}
43+
44+
configuration { "windows", "x32" }
45+
libdirs
46+
{
47+
Helium.GetFbxSdkLocation() .. "/lib/" .. _ACTION .. "/x86",
48+
}
49+
configuration { "windows", "x64" }
4350
libdirs
4451
{
45-
Helium.GetFbxSdkLocation() .. "/lib/vs2008",
52+
Helium.GetFbxSdkLocation() .. "/lib/" .. _ACTION .. "/x64",
4653
}
4754

4855
configuration {}

0 commit comments

Comments
 (0)