github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.uppbox

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@14369 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-04-24 14:17:28 +00:00
parent 44ed1c1147
commit e36d4e6d5e
8 changed files with 139 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

0
uppbox/HowTo/HowTo.upp Normal file
View file

4
uppbox/Scripts/Scripts.upp
View file

@ -26,7 +26,11 @@ file
win, win,
www, www,
git-merge.txt, git-merge.txt,
win32 readonly separator,
updateinfo.txt, updateinfo.txt,
clang-win.txt,
vc32.bat,
vc64.bat,
checklist.txt; checklist.txt;
mainconfig mainconfig

3
uppbox/Scripts/checklist.txt
View file

@ -4,4 +4,5 @@
- Check app icon linking in Win32 - Check app icon linking in Win32
- Check OpenGl - Check OpenGl
- Check SDLSoundDemo - Check SDLSoundDemo
- Check PDB tests in all configs - Check PDB tests in all configs
- Check RectTracker, Posix / MacOS / Win32

10
uppbox/Scripts/clang-win.txt Normal file
View file

@ -0,0 +1,10 @@
NOT USED NOW:
- install msys2, start mingw-msys2
- pacman -S git subversion mingw-w64-x86_64-gcc mingw-w64-x86_64-ninja mingw-w64-x86_64-cmake make mingw-w64-x86_64-python3
- git clone https://github.com/mstorsjo/llvm-mingw.git
build-all.sh:
./build-mingw-w64.sh $PREFIX --with-default-msvcrt=msvcrt
--------------------------------

147
uppbox/Scripts/updateinfo.txt
View file

@ -9,56 +9,99 @@ About, BSD
2019-03-22: 2019 2019-03-22: 2019
------------------------------------------------------------------ ------------------------------------------------------------------
mingw64 CLANG
https://sourceforge.net/projects/mingw-w64/files/mingw-w64/ https://github.com/mstorsjo/llvm-mingw/releases
x86_64-win32-seh Copy to bin
i686-win32-dwarf rename old clang to clang.old before deleting
rename to clang
directories renamed mingw32->bin/mingw64/32, mingw64->bin/mingw64/64 delete aarch and arm7 folders and .exe from bin
http://releases.llvm.org/download.html
Now download clang 64
search for ld.ldd.exe in bin
replace ld.exe in
C:\upp\bin\mingw64\64\x86_64-w64-mingw32\bin
C:\upp\bin\mingw64\32\i686-w64-mingw32\bin
Check MingwCatchTest
Check exe icon issue
initial: MinGW-W64 GCC-7.2.0
2019-03-22: 8.1.0
2020-02-13: ldd.exe update to clang 9.0.0
------------------------------------------------------------------ ------------------------------------------------------------------
OpenSSL OpenSSL
// deprecated ==== Building openssl for win32 clang/mingw:
https://www.npcglib.org/~stathis/blog/precompiled-openssl/
install 1.0.2? Win32, Win64 Install msys2 into c:/msys64, user cxl
Install pacman -S perl
Copy corresponding files Start msys2 mingw 64
Alternative: Domestic build... (ask Novo :) Copy current clang to ~
initial: 1.0.2l download 1.1.1 openssl, unpack to ~
2019-03-31: 1.0.2r
// new edit .bashrc, add
From https://slproweb.com/products/Win32OpenSSL.html export PATH=/home/cxl/clang/bin:$PATH
download and install
Win32 OpenSSL v1.0.2? test clang, clang++
Win64 OpenSSL v1.0.2?
in openssl dir
./config CC=clang CXX=clang++
make
copy ./include/openssl to C:\upp\bin\clang\include
copy ./libcrypto.a and ./libssl.a to C:\upp\bin\clang\x86_64-w64-mingw32\lib
test upptst/Https with CLANGx64, release, debug
close msys2
start msys2 mingw 32
check that i686-w64-mingw32-clang works
cd openssl...
make clean
./config CC=clang CXX=clang++ --cross-compile-prefix=i686-w64-mingw32-
make
copy ./libcrypto.a and ./libssl.a to C:\upp\bin\clang\i686-w64-mingw32\lib
test upptst/Https with CLANG, release, debug
==== MSC static versions
netasm, strawberry perl
make sure Scripts folder is on path
from perl prompt run
vc32.bat
cd .../openssl...
perl ./Configure VC-WIN32
edit Makefile
CNF_CFLAGS=/Gs0 /GF /Gy /MT
LIB_CFLAGS=$(CNF_CFLAGS) $(CFLAGS)
to remove debug info and make it link with the right library
nmake
libcrypto_static.lib, libssl_static.lib -> bin/openssl/lib32/crypto.lib, ssl.lib
openssl -> bin/openssl/include
close perl / reopen perl to clean PATH
vc64.bat
nmake clean
perl ./Configure VC-WIN64A
edit Makefile
CNF_CFLAGS=/Gs0 /GF /Gy /MT
LIB_CFLAGS=$(CNF_CFLAGS) $(CFLAGS)
nmake
libcrypto_static.lib, libssl_static.lib -> bin/openssl/lib64/crypto.lib, ssl.lib
Copy corresponding files (minimum of them)
Test CLANG/CLANGx64/MSBT/MSBTx64
------------------------------------------------------------------ ------------------------------------------------------------------
plugin/jpg plugin/jpg
@ -319,3 +362,35 @@ current 6.1.11 Jule 13 2017
GLM GLM
https://github.com/g-truc/glm https://github.com/g-truc/glm
====================================================================
DEPRECATED (NOT USED ANYMORE)
------------------------------------------------------------------
mingw64 (not anymore...)
https://sourceforge.net/projects/mingw-w64/files/mingw-w64/
x86_64-win32-seh
i686-win32-dwarf
directories renamed mingw32->bin/mingw64/32, mingw64->bin/mingw64/64
http://releases.llvm.org/download.html
Now download clang 64
search for ld.ldd.exe in bin
replace ld.exe in
C:\upp\bin\mingw64\64\x86_64-w64-mingw32\bin
C:\upp\bin\mingw64\32\i686-w64-mingw32\bin
Check MingwCatchTest
Check exe icon issue
initial: MinGW-W64 GCC-7.2.0
2019-03-22: 8.1.0
2020-02-13: ldd.exe update to clang 9.0.0

3
uppbox/Scripts/vc32.bat Normal file
View file

@ -0,0 +1,3 @@
set PATH=c:/upp/nasm;c:/program files (x86)/microsoft visual studio/2019/buildtools/vc/tools/msvc/14.23.28105/bin/hostx86/x86;c:/program files (x86)/windows kits/10/bin/10.0.18362.0/x86;C:\\upp\\bin/openssl/bin;C:\\upp\\bin/SDL2/lib/x86;C:\\upp\\bin/pgsql/x86/bin;C:\\upp\\bin/mysql/lib32;%PATH%
set INCLUDE=c:/program files (x86)/microsoft visual studio/2019/buildtools/vc/tools/msvc/14.23.28105/include;c:/program files (x86)/windows kits/10/include/10.0.18362.0/um;c:/program files (x86)/windows kits/10/include/10.0.18362.0/ucrt;c:/program files (x86)/windows kits/10/include/10.0.18362.0/shared
set LIB=c:/program files (x86)/microsoft visual studio/2019/buildtools/vc/tools/msvc/14.23.28105/lib/x86;c:/program files (x86)/windows kits/10/lib/10.0.18362.0/ucrt/x86;c:/program files (x86)/windows kits/10/lib/10.0.18362.0/um/x86

3
uppbox/Scripts/vc64.bat Normal file
View file

@ -0,0 +1,3 @@
set PATH=c:/upp/nasm;c:/program files (x86)/microsoft visual studio/2019/buildtools/vc/tools/msvc/14.23.28105/bin/hostx64/x64;c:/program files (x86)/windows kits/10/bin/10.0.18362.0/x64;C:\\upp\\bin/openssl/bin64;C:\\upp\\bin/SDL2/lib/x64;C:\\upp\\bin/pgsql/x64/bin;C:\\upp\\bin/mysql/lib64;%PATH%
set INCLUDE=c:/program files (x86)/microsoft visual studio/2019/buildtools/vc/tools/msvc/14.23.28105/include;c:/program files (x86)/windows kits/10/include/10.0.18362.0/um;c:/program files (x86)/windows kits/10/include/10.0.18362.0/ucrt;c:/program files (x86)/windows kits/10/include/10.0.18362.0/shared
set LIB=c:/program files (x86)/microsoft visual studio/2019/buildtools/vc/tools/msvc/14.23.28105/lib/x64;c:/program files (x86)/windows kits/10/lib/10.0.18362.0/ucrt/x64;c:/program files (x86)/windows kits/10/lib/10.0.18362.0/um/x64

7
uppbox/ToDo/2020.1
View file

@ -16,13 +16,18 @@ https://www.ultimatepp.org/forums/index.php?t=msg&th=10964&start=0&
gtk3 warnings gtk3 warnings
macos installation visual C++ static libs
fix progress
macos UDH rect tracker
NTH: NTH:
DONE: DONE:
- macos installation
- filesel - improve appearance (?) - filesel - improve appearance (?)
- PDB Pointer undefined array should stop early - PDB Pointer undefined array should stop early
- Console terminal not working in fedora - Console terminal not working in fedora