diff options
Diffstat (limited to 'JavaScriptCore/jscore.bkl')
| -rw-r--r-- | JavaScriptCore/jscore.bkl | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/JavaScriptCore/jscore.bkl b/JavaScriptCore/jscore.bkl index e88b9f0..25e17d7 100644 --- a/JavaScriptCore/jscore.bkl +++ b/JavaScriptCore/jscore.bkl @@ -48,6 +48,22 @@ JavaScriptCore Bakefile project file. $(JSCORE_VM_SOURCES) $(JSCORE_WTF_SOURCES) </sources> + + <set var="ASSEMBLER_SOURCES"> + <if cond="WX_PORT=='gtk2'"> + $(JSCORE_VM_SOURCES_POSIX) + </if> + <if cond="PLATFORM_OS=='mac'"> + $(JSCORE_VM_SOURCES_POSIX) + </if> + <if cond="WX_PORT=='msw'"> + $(JSCORE_VM_SOURCES_WIN) + </if> + </set> + + <sources> + $(ASSEMBLER_SOURCES) + </sources> <install-to>$(WKOUTPUTDIR)</install-to> <pic>on</pic> <threading>multi</threading> @@ -77,7 +93,7 @@ JavaScriptCore Bakefile project file. <!-- FIXME: we need proper configure checks --> <define>HAVE_FUNC_ISNAN</define> <!-- check for undefined symbols for debugging reasons --> - <ldflags>-Wl,--no-undefined</ldflags> + <ldflags>-Wl</ldflags> </if> <if cond="PLATFORM_WIN32=='1'"> @@ -110,16 +126,12 @@ JavaScriptCore Bakefile project file. <include>$(WK_ROOT)/JavaScriptCore/wtf</include> <dirname>$(WKOUTPUTDIR)</dirname> <sources>$(SRCDIR)/jsc.cpp</sources> - <if cond="FORMAT=='gnu'"> - <ldflags>$(WKOUTPUTDIR)/libjscore.a</ldflags> - </if> <set var="READLINE_LIB"> <if cond="WX_PORT=='mac'">edit</if> </set> <sys-lib>$(READLINE_LIB)</sys-lib> <if cond="FORMAT in ['msvc','msvs2005prj']"> <include>$(WK_ROOT)/WebKitLibraries/win/include</include> - <sys-lib>jscore</sys-lib> <sys-lib>winmm</sys-lib> <!-- for timeGetTime --> <lib-path>$(WKOUTPUTDIR)</lib-path> <lib-path>$(WK_ROOT)/WebKitLibraries/win/lib</lib-path> |