Code Merge Request #2: Windows 64-bit fixes (merged)

Merging...

Merged

Something went wrong. Please, merge manually

Checking if merge is possible...

Something went wrong. Please, merge manually

rubenvb asked you to merge 1 commit from /u/rubenvb/texstudio/ to default, 3 days ago

Fix 64-bit Windows compilation. Tested using MSYS2's MinGW-w64 compiler.

Commit Date  
[6896e2] (defaulttip) by Ruben Van Boxem Ruben Van Boxem

Fix MinGW-w64 64-bit compilation

2014-07-28 08:51:36 Tree

Discussion

  • rubenvb
    rubenvb
    2014-07-28

    OK, this mercurial thing is new to me. The only thing relevant here is the top change, and then really only the two source files.

    Although I would strongly recommend to remove the DLL filenames from LIBS, and instead use what I have written, which should work if people installed the libraries correctly. Also: MSYS2 is highly recommended as a package manager for MinGW developers. Just a tip ;-)

     
    • Status: open --> merged