Author: mikej Date: Sat Dec 23 21:36:45 2006 New Revision: 3823 Modified: freeswitch/trunk/libs/win32/js/js.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: get spidermonkey building again, we still have a build issue with the file object that is not quite right. Modified: freeswitch/trunk/libs/win32/js/js.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/js/js.vcproj (original) +++ freeswitch/trunk/libs/win32/js/js.vcproj Sat Dec 23 21:36:45 2006 @@ -25,7 +25,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" > "$(ProjectDir)..\..\js\config.h" if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" > "$(ProjectDir)..\..\js\src\jsautocfg.h" if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" > "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h"" + CommandLine="if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" > "$(ProjectDir)..\..\js\config.h" if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" > "$(ProjectDir)..\..\js\src\jsautocfg.h" if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" > "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" " /> <Tool Name="VCCustomBuildTool" @@ -111,7 +111,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.release\nspr-4.6.1\lib\libnspr4.dll $(OutDir)\ /C /Y /D xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.release\nspr-4.6.1\lib\libplc4.dll $(OutDir)\ /C /Y /D xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.release\nspr-4.6.1\lib\libplds4.dll $(OutDir)\ /C /Y /D " + CommandLine="" /> </Configuration> <Configuration @@ -125,7 +125,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" > "$(ProjectDir)..\..\js\config.h" if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" > "$(ProjectDir)..\..\js\src\jsautocfg.h" if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" > "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h"" + CommandLine="if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" > "$(ProjectDir)..\..\js\config.h" if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" > "$(ProjectDir)..\..\js\src\jsautocfg.h" if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" > "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" " /> <Tool Name="VCCustomBuildTool" @@ -209,7 +209,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.debug\nspr-4.6.1\lib\libnspr4.dll $(OutDir)\ /C /Y /D xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.debug\nspr-4.6.1\lib\libplc4.dll $(OutDir)\ /C /Y /D xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.debug\nspr-4.6.1\lib\libplds4.dll $(OutDir)\ /C /Y /D " + CommandLine="" /> </Configuration> </Configurations> Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Sat Dec 23 21:36:45 2006 @@ -2262,7 +2262,9 @@ JS_InitStandardClasses(cx, javascript_object); /* this doesnt load in standard classes figure out wtf */ - js_InitFileClass(cx, javascript_object); +#ifndef _MSC_VER //somthing is badly wrong in our build here, need to fix this. + js_InitFileClass(cx, javascript_object); +#endif JS_InitClass(cx, javascript_object,