Skip to content

Commit

Permalink
2021.9
Browse files Browse the repository at this point in the history 
new: luajit bindings, DLL support, documentation generator and website
new: versioning fwk.dll file now
new: video_pause(), argc/v flag(), -DWITH_SELFIES=1, ui_image()
new: window_icon(), cooker_config()
new: die(), hexdump(), hexdumpf(),
new: RGB3(), RGB4(), sprite_update(),
new: app_name(), time_us(), sleep_us()
chg: sprite()->tile(), sprite_ex()->sprite(),
chg: time_human()->date_human(),
chg: ui_bool/float/string_const()->ui_const_bool/float/string()
fix: udp_sendto(), clock_gettime(), screenshot()
fix: fix #9, fix compilation on vanilla windows (no msvc, no gcc); embed vc140 runtime deps for ass2iqe.exe
fix: updated gamepad mappings
fix: tcc+win warnings, mingw64 warnings
fix: improved mingw detection
fix: OSX/Linux fixes
  • Loading branch information
@r-lyeh
r-lyeh committed Aug 31, 2024
1 parent c96afb8 commit 04086ef
Show file tree
Hide file tree
Showing 1,418 changed files with 1,270,491 additions and 0 deletions.
246 changes: 246 additions & 0 deletions 2021.9/MAKE.bat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,246 @@
#!/bin/bash 2>nul || goto :windows

# linux + osx -----------------------------------------------------------------
cd `dirname $0`

cp art/demos/* . -n

if [ "$(uname)" != "Darwin" ]; then
# setup (linux)
sudo apt-get update
sudo apt-get install g++ ffmpeg libx11-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev # absolute minimum
#sudo apt-get install g++ ffmpeg xorg-dev # memorable, around 100 mib
#sudo apt-get install g++ ffmpeg xorg-dev libglfw3-dev libassimp-dev clang # initial revision

# pipeline
#cc art/tools/ass2iqe.c -o art/tools/ass2iqe -lm -ldl -lpthread -w -g -lassimp
#cc art/tools/iqe2iqm.cpp -o art/tools/iqe2iqm -lm -ldl -lpthread -w -g -lstdc++
#cc art/tools/mid2wav.c -o art/tools/mid2wav -lm -ldl -lpthread -w -g
#cc art/tools/xml2json.c -o art/tools/xml2json -lm -ldl -lpthread -w -g

# change permissions of precompiled tools binaries because of 'Permission denied' runtime error (@procedural)
chmod +x art/tools/ass2iqe
chmod +x art/tools/iqe2iqm
chmod +x art/tools/mid2wav
chmod +x art/tools/xml2json
chmod +x art/tools/ffmpeg

# framework
echo fwk && cc -c fwk.c -w -g

# demos
echo demo && cc -o demo demo.c fwk.o -lm -ldl -lpthread -w -g &
echo demo_cubemap && cc -o demo_cubemap demo_cubemap.c fwk.o -lm -ldl -lpthread -w -g &
echo demo_collide && cc -o demo_collide demo_collide.c fwk.o -lm -ldl -lpthread -w -g &
echo demo_model && cc -o demo_model demo_model.c fwk.o -lm -ldl -lpthread -w -g &
echo demo_scene && cc -o demo_scene demo_scene.c fwk.o -lm -ldl -lpthread -w -g &
echo demo_shadertoy && cc -o demo_shadertoy demo_shadertoy.c fwk.o -lm -ldl -lpthread -w -g &
echo demo_sprite && cc -o demo_sprite demo_sprite.c fwk.o -lm -ldl -lpthread -w -g &
echo demo_video && cc -o demo_video demo_video.c fwk.o -lm -ldl -lpthread -w -g &
echo demo_script && cc -o demo_script demo_script.c fwk.o -lm -ldl -lpthread -w -g &
echo demo_socket && cc -o demo_socket demo_socket.c fwk.o -lm -ldl -lpthread -w -g &
fi

if [ "$(uname)" = "Darwin" ]; then
# setup (osx)
export SDKROOT=$(xcrun --show-sdk-path)

# pipeline
#cc art/tools/ass2iqe.c -o art/tools/ass2iqe.osx -w -g -lassimp
#cc art/tools/iqe2iqm.cpp -o art/tools/iqe2iqm.osx -w -g -lstdc++
#cc art/tools/mid2wav.c -o art/tools/mid2wav.osx -w -g
#cc art/tools/xml2json.c -o art/tools/xml2json.osx -w -g

# change permissions of precompiled tools binaries because of 'Permission denied' runtime error (@procedural)
chmod +x art/tools/ass2iqe.osx
chmod +x art/tools/iqe2iqm.osx
chmod +x art/tools/mid2wav.osx
chmod +x art/tools/xml2json.osx
chmod +x art/tools/ffmpeg.osx

# framework
echo fwk && cc -c -ObjC fwk.c -w -g

# demos
echo demo && cc -o demo demo.c fwk.o -framework cocoa -framework iokit -w -g &
echo demo_cubemap && cc -o demo_cubemap demo_cubemap.c fwk.o -framework cocoa -framework iokit -w -g &
echo demo_collide && cc -o demo_collide demo_collide.c fwk.o -framework cocoa -framework iokit -w -g &
echo demo_model && cc -o demo_model demo_model.c fwk.o -framework cocoa -framework iokit -w -g &
echo demo_scene && cc -o demo_scene demo_scene.c fwk.o -framework cocoa -framework iokit -w -g &
echo demo_shadertoy && cc -o demo_shadertoy demo_shadertoy.c fwk.o -framework cocoa -framework iokit -w -g &
echo demo_sprite && cc -o demo_sprite demo_sprite.c fwk.o -framework cocoa -framework iokit -w -g &
echo demo_video && cc -o demo_video demo_video.c fwk.o -framework cocoa -framework iokit -w -g &
echo demo_script && cc -o demo_script demo_script.c fwk.o -framework cocoa -framework iokit -w -g &
echo demo_socket && cc -o demo_socket demo_socket.c fwk.o -framework cocoa -framework iokit -w -g &
fi

exit



:windows -----------------------------------------------------------------------
@echo off

rem setup
if "%Platform%"=="" (
echo Warning: Trying VS 2013/2015/2017/2019 x64 ...
set Platform=x64
if exist "%VS190COMNTOOLS%/../../VC/Auxiliary/Build/vcvarsx86_amd64.bat" (
@call "%VS190COMNTOOLS%/../../VC/Auxiliary/Build/vcvarsx86_amd64.bat"
) else if exist "%VS160COMNTOOLS%/../../VC/Auxiliary/Build/vcvarsx86_amd64.bat" (
@call "%VS160COMNTOOLS%/../../VC/Auxiliary/Build/vcvarsx86_amd64.bat"
) else if exist "%VS150COMNTOOLS%/../../VC/Auxiliary/Build/vcvarsx86_amd64.bat" (
@call "%VS150COMNTOOLS%/../../VC/Auxiliary/Build/vcvarsx86_amd64.bat"
) else if exist "%VS140COMNTOOLS%/../../VC/bin/x86_amd64/vcvarsx86_amd64.bat" (
@call "%VS140COMNTOOLS%/../../VC/bin/x86_amd64/vcvarsx86_amd64.bat"
) else if exist "%VS120COMNTOOLS%/../../VC/bin/x86_amd64/vcvarsx86_amd64.bat" (
@call "%VS120COMNTOOLS%/../../VC/bin/x86_amd64/vcvarsx86_amd64.bat"
) else if exist "%ProgramFiles%/microsoft visual studio/2022/community/VC/Auxiliary/Build/vcvarsx86_amd64.bat" (
@call "%ProgramFiles%/microsoft visual studio/2022/community/VC/Auxiliary/Build/vcvarsx86_amd64.bat"
) else if exist "%ProgramFiles(x86)%/microsoft visual studio/2019/community/VC/Auxiliary/Build/vcvarsx86_amd64.bat" (
@call "%ProgramFiles(x86)%/microsoft visual studio/2019/community/VC/Auxiliary/Build/vcvarsx86_amd64.bat"
) else if exist "%ProgramFiles(x86)%/microsoft visual studio/2017/community/VC/Auxiliary/Build/vcvarsx86_amd64.bat" (
@call "%ProgramFiles(x86)%/microsoft visual studio/2017/community/VC/Auxiliary/Build/vcvarsx86_amd64.bat"
) else (
echo Warning: Trying Mingw64 ...
set Platform=mingw64
where /q gcc.exe || ( set Platform=tcc&&echo Warning: Trying TCC ... )
)
)

cd "%~dp0"
echo @%~dp0\art\tools\tcc-win\tcc -I %~dp0\art\tools\tcc-win\include_mingw\winapi -I %~dp0\art\tools\tcc-win\include_mingw\ %%* > tcc.bat

rem generate bindings
if "%1"=="bindings" (
rem luajit
art\tools\luajit art\tools\make_luajit_bindings.lua > fwk.lua

exit /b
)
rem generate documentation
if "%1"=="docs" (

rem set symbols for upcoming doc generation
set VERSION=2021.9
date /t > info.obj
set /p LAST_MODIFIED=<info.obj
rem set git symbols too
git rev-list --count --first-parent HEAD > info.obj
set /p GIT_REVISION=<info.obj
git rev-parse --abbrev-ref HEAD > info.obj
set /p GIT_BRANCH=<info.obj

cl art\docs\docs.c fwk.c -I. %2
docs fwk.h --excluded=3rd_glad.h,fwk.h,fwk_compat.h, > fwk.html
copy /y fwk.html art\docs\docs.html

exit /b
)

rem copy demos to root folder. local changes are preserved
echo n | copy /-y art\demos\* 1> nul 2> nul

rem tidy environment
if "%1"=="tidy" (
del .temp*.*
del *.zip
del *.mem
del *.exp
del *.lib
del *.exe
del *.obj
del *.o
del *.pdb
del *.ilk
del *.png
del *.def
rem del *.dll
del demo_*.*
rd /q /s .vs
del tcc.bat
exit /b
)

if "%Platform%"=="x64" (
rem pipeline
rem cl art/tools/ass2iqe.c /Feart/tools/ass2iqe.exe /nologo /openmp /O2 /Oy /MT /DNDEBUG /DFINAL assimp.lib
rem cl art/tools/iqe2iqm.cpp /Feart/tools/iqe2iqm.exe /nologo /openmp /O2 /Oy /MT /DNDEBUG /DFINAL
rem cl art/tools/mid2wav.c /Feart/tools/mid2wav.exe /nologo /openmp /O2 /Oy /MT /DNDEBUG /DFINAL
rem cl art/tools/xml2json.c /Feart/tools/xml2json.exe /nologo /openmp /O2 /Oy /MT /DNDEBUG /DFINAL

rem [HINT] static linking vs dll
rem SLL: cl fwk.c && cl demo.c fwk.obj
rem DLL: cl fwk.c /LD /DAPI=EXPORT && cl demo.c fwk.lib /DAPI=IMPORT

rem [HINT] optimization flags for release builds
rem method 1: /Ox /Oy /MT /DNDEBUG /DFINAL
rem method 2: /O1 /MT /DNDEBUG /DFINAL /GL /GF /arch:AVX2

rem framework
cl fwk.c /c /nologo /openmp /Zi %*

rem demos
cl demo.c fwk.obj /nologo /openmp /Zi %*
cl demo_cubemap.c fwk.obj /nologo /openmp /Zi %*
cl demo_collide.c fwk.obj /nologo /openmp /Zi %*
cl demo_model.c fwk.obj /nologo /openmp /Zi %*
cl demo_scene.c fwk.obj /nologo /openmp /Zi %*
cl demo_shadertoy.c fwk.obj /nologo /openmp /Zi %*
cl demo_sprite.c fwk.obj /nologo /openmp /Zi %*
cl demo_video.c fwk.obj /nologo /openmp /Zi %*
cl demo_script.c fwk.obj /nologo /openmp /Zi %*
cl demo_socket.c fwk.obj /nologo /openmp /Zi %*

rem luajit+fwk.dll demo
rem cl fwk.c /LD /DAPI=EXPORT /O2 /Oy /MT /DNDEBUG
rem art\tools\luajit demo_luajit.lua

) else if "%Platform%"=="mingw64" (
rem pipeline
rem gcc art/tools/ass2iqe.c -o art/tools/ass2iqe.exe -w -lassimp
rem gcc art/tools/iqe2iqm.cpp -o art/tools/iqe2iqm.exe -w -lstdc++
rem gcc art/tools/mid2wav.c -o art/tools/mid2wav.exe -w
rem gcc art/tools/xml2json.c -o art/tools/xml2json.exe -w

rem framework
echo fwk && gcc -c fwk.c -std=c99 -w -g

rem demos
echo demo && gcc -o demo demo.c fwk.o -lws2_32 -lgdi32 -lwinmm -ldbghelp -std=c99 -w -g
echo demo_cubemap && gcc -o demo_cubemap demo_cubemap.c fwk.o -lws2_32 -lgdi32 -lwinmm -ldbghelp -std=c99 -w -g
echo demo_collide && gcc -o demo_collide demo_collide.c fwk.o -lws2_32 -lgdi32 -lwinmm -ldbghelp -std=c99 -w -g
echo demo_model && gcc -o demo_model demo_model.c fwk.o -lws2_32 -lgdi32 -lwinmm -ldbghelp -std=c99 -w -g
echo demo_scene && gcc -o demo_scene demo_scene.c fwk.o -lws2_32 -lgdi32 -lwinmm -ldbghelp -std=c99 -w -g
echo demo_shadertoy && gcc -o demo_shadertoy demo_shadertoy.c fwk.o -lws2_32 -lgdi32 -lwinmm -ldbghelp -std=c99 -w -g
echo demo_sprite && gcc -o demo_sprite demo_sprite.c fwk.o -lws2_32 -lgdi32 -lwinmm -ldbghelp -std=c99 -w -g
echo demo_video && gcc -o demo_video demo_video.c fwk.o -lws2_32 -lgdi32 -lwinmm -ldbghelp -std=c99 -w -g
echo demo_script && gcc -o demo_script demo_script.c fwk.o -lws2_32 -lgdi32 -lwinmm -ldbghelp -std=c99 -w -g
echo demo_socket && gcc -o demo_socket demo_socket.c fwk.o -lws2_32 -lgdi32 -lwinmm -ldbghelp -std=c99 -w -g
) else (
rem pipeline
rem gcc art/tools/ass2iqe.c -o art/tools/ass2iqe.exe -w -lassimp
rem gcc art/tools/iqe2iqm.cpp -o art/tools/iqe2iqm.exe -w -lstdc++
rem gcc art/tools/mid2wav.c -o art/tools/mid2wav.exe -w
rem gcc art/tools/xml2json.c -o art/tools/xml2json.exe -w

rem framework
echo fwk && tcc -c fwk.c -w

rem demos
echo demo && tcc demo.c fwk.o -w
echo demo_cubemap && tcc demo_cubemap.c fwk.o -w
echo demo_collide && tcc demo_collide.c fwk.o -w
echo demo_model && tcc demo_model.c fwk.o -w
echo demo_scene && tcc demo_scene.c fwk.o -w
echo demo_shadertoy && tcc demo_shadertoy.c fwk.o -w
echo demo_sprite && tcc demo_sprite.c fwk.o -w
echo demo_video && tcc demo_video.c fwk.o -w
echo demo_script && tcc demo_script.c fwk.o -w
echo demo_socket && tcc demo_socket.c fwk.o -w
)

rem PAUSE only if double-clicked from Windows
(((echo.%cmdcmdline%)|%WINDIR%\system32\find.exe /I "%~0")>nul)&&pause
exit /b
Loading

0 comments on commit 04086ef

Please sign in to comment.