Skip to content
This repository has been archived by the owner on Jan 20, 2024. It is now read-only.

Commit

Permalink
scene: object texture push/pop state mechanism
Browse files Browse the repository at this point in the history
tools: assimp 5.2.1
make: demo (@zaklaus), checkmem (minimize false positives), dll (MT).
pipe: add PROGRESS symbol, extra clarifications.
demo: add debugger.lua
misc: rebuilt dll, docs, bindings.
  • Loading branch information
r-lyeh committed Feb 18, 2022
2 parents f0abf0f + b3d8107 commit ba31a43
Show file tree
Hide file tree
Showing 14 changed files with 790 additions and 52 deletions.
48 changes: 30 additions & 18 deletions MAKE.bat
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ exit

rem setup
if "%Platform%"=="" (
echo Warning: Trying VS 2013/2015/2017/2019 x64 ...
echo Warning: Trying VS 2022/2019/2017/2015/2013 x64 ...
set Platform=x64
if exist "%VS190COMNTOOLS%/../../VC/Auxiliary/Build/vcvarsx86_amd64.bat" (
@call "%VS190COMNTOOLS%/../../VC/Auxiliary/Build/vcvarsx86_amd64.bat"
Expand Down Expand Up @@ -143,6 +143,15 @@ if "%Platform%"=="" (
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 dll
if "%1"=="dll" (
rem cl fwk.c /LD /DAPI=EXPORT && rem 6.6MiB
rem cl fwk.c /LD /DAPI=EXPORT /O2 && rem 5.3MiB
cl fwk.c /LD /DAPI=EXPORT /Os /Ox /O2 /Oy /GL /GF /MT && rem 4.7MiB
move /y fwk.dll demos\lua

exit /b
)
rem generate bindings
if "%1"=="bindings" (
rem luajit
Expand Down Expand Up @@ -171,36 +180,39 @@ if "%1"=="docs" (
exit /b
)

rem build & execute single demo. usage: make demo name "compiler args" "program args"
if "%1"=="demo" (
setlocal enableDelayedExpansion
set "FILENAME=demo"
if exist "demo_%2.c" (
set "FILENAME=demo_%2"
)
copy /y !FILENAME!.c demos\!FILENAME!.c
cl !FILENAME!.c /nologo /openmp /Zi fwk.c %~3%
if %ERRORLEVEL%==0 (call !FILENAME!.exe %~4%) else (echo Compilation error: !FILENAME!)
exit /b
)

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

rem shortcuts for split & join amalgamation scripts
if "%1"=="split" (
call art\tools\split
exit /b
)

if "%1"=="join" (
call art\tools\join
exit /b
)

rem check memory api calls
if "%1"=="checkmem" (
findstr /NC:"realloc(" fwk.c
findstr /NC:"malloc(" fwk.c
findstr /NC:"free(" fwk.c
findstr /NC:"calloc(" fwk.c
findstr /NC:"strdup(" fwk.c
exit /b
)

rem dll publish
if "%1"=="dll" (
rem cl fwk.c /LD /DAPI=EXPORT && rem 6.6MiB
rem cl fwk.c /LD /DAPI=EXPORT /O2 && rem 5.3MiB
cl fwk.c /LD /DAPI=EXPORT /Os /Ox /O2 /Oy /GL /GF && rem 4.7MiB
move /y fwk.dll demos\lua

findstr /RNC:"[^_xv]realloc[(]" fwk.c
findstr /RNC:"[^_xv]malloc[(]" fwk.c
findstr /RNC:"[^_xv]free[(]" fwk.c
findstr /RNC:"[^_xv]calloc[(]" fwk.c
findstr /RNC:"[^_xv]strdup[(]" fwk.c
exit /b
)

Expand All @@ -220,7 +232,7 @@ if "%1"=="tidy" (
del *.ilk
del *.png
del *.def
rem del *.dll
del *.dll
del 3rd_*.*
del fwk_*.*
del demo_*.*
Expand Down
Empty file.
26 changes: 22 additions & 4 deletions art/docs/docs.html

Large diffs are not rendered by default.

Binary file modified art/tools/ass2iqe.exe
Binary file not shown.
Binary file modified art/tools/assimp-vc142-mt.dll
Binary file not shown.
Empty file.
Empty file.
Loading

0 comments on commit ba31a43

Please sign in to comment.