Review Request 115457: Allow compiling KJS on windows

[Alexander Richardson]

> On Feb. 4, 2014, 1:52 p.m., Alex Merry wrote:
> > src/wtf/MathExtras.h, line 122
> > <https://git.reviewboard.kde.org/r/115457/diff/1/?file=241703#file241703line122>
> >
> >     Huh?  So this is a nested #if COMPILER(MSVC)?  I think the inner one should go...

Yep, code folding revealed that it was a nested COMPILER(MSVC).


> On Feb. 4, 2014, 1:52 p.m., Alex Merry wrote:
> > src/kjs/CMakeLists.txt, line 202
> > <https://git.reviewboard.kde.org/r/115457/diff/1/?file=241700#file241700line202>
> >
> >     Why is KJS using its own home-cooked export macros instead of the ECM ones?  The API *does* use the ECM-generated export header.
> >     
> >     Well, JavaScript interpreters are dark beasts I'm not sure I want to get into...

It has these macros defined in global.h. I didn't feel like porting it to generate_export_header, just wanted to get it to compile


- Alexander


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/115457/#review48908
-----------------------------------------------------------


On Feb. 4, 2014, 1:10 a.m., Alexander Richardson wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/115457/
> -----------------------------------------------------------
> 
> (Updated Feb. 4, 2014, 1:10 a.m.)
> 
> 
> Review request for KDE Frameworks and kdewin.
> 
> 
> Repository: kjs
> 
> 
> Description
> -------
> 
> A few small commits, I only made one review request since it is only a small patch alltogether
> 
> 
> Use the correct define _WIN32 instead of WIN32
> 
> This fixes the build with MSVC
> 
> -----------------------------
> 
> Fix MSVC linking of the test executables
> 
> -------------------------------
> 
> Fix includes on Windows
> 
> timeapi.h is needed for timeGetTime() and xmath.h no longer exists with
> newer MSVC versions
> 
> ------------------------------------------------------
> 
> Fix the PLATFORM(), COMPILER() etc. macros on MSVC
> 
> MSVC does not handle expanding defined() inside macros
> 
> -------------------------------------------------
> 
> Fix linkage on MSVC
> 
> We have to define MAKE_KJS_LIB to get dllimport/dllexport right
> 
> -------------------------------------------------------
> 
> Get rid of KDEWIN_INCLUDES and KDEWIN_LIBRARIES
> 
> These variables no longer exist
> 
> ------------------------------------------------------------
> 
> Use ecm_mark_nongui_executable to fix linking on Windows
> 
> 
> Diffs
> -----
> 
>   CMakeLists.txt 99b0c4edd1f641900527ea79b13dba230a1025e2 
>   src/kjs/function.h c09bd385ff2aa1dd48a80aa1032d26787514ce04 
>   src/kjs/object.h e2279cb026783dee1ffb2c737f6181de0f41464f 
>   src/wtf/MathExtras.h 50fb006a259797b16bfce09b5e2d101cf127fb38 
>   src/wtf/Platform.h 39e55dac1ba69feee47b8609cf05b91541f9740b 
>   tests/CMakeLists.txt 71664cc7dd4df31ed56243440666217e1177619c 
>   tests/testkjs.cpp a00ed144b54896842beb9a6519d107fdff102319 
>   src/kjs/CMakeLists.txt c1c8cef2bf1e44c8d762d6894310ce68ca05b2d7 
>   autotests/CMakeLists.txt 1268b8a6555fd36cd73f97beb6989b21056160f0 
> 
> Diff: https://git.reviewboard.kde.org/r/115457/diff/
> 
> 
> Testing
> -------
> 
> 
> Thanks,
> 
> Alexander Richardson
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20140204/2ab990b8/attachment-0001.html>