From 624adb1b23f99c0bdfc6647a717453d25a9c516c Mon Sep 17 00:00:00 2001 From: ocornut Date: Mon, 16 Nov 2015 22:03:13 +0100 Subject: [PATCH] Tweak build batch files and readmes --- examples/.gitignore | 1 + examples/allegro5_example/README.md | 5 ++--- examples/opengl3_example/build_win32.bat | 2 +- examples/opengl_example/build_win32.bat | 2 +- examples/sdl_opengl_example/README.md | 5 ++--- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/examples/.gitignore b/examples/.gitignore index acd8b013..61704991 100644 --- a/examples/.gitignore +++ b/examples/.gitignore @@ -28,6 +28,7 @@ opengl3_example/opengl3_example *.o *.obj *.exe +*.pdb ## Ini files imgui.ini diff --git a/examples/allegro5_example/README.md b/examples/allegro5_example/README.md index a444e5b2..d891982b 100644 --- a/examples/allegro5_example/README.md +++ b/examples/allegro5_example/README.md @@ -9,8 +9,7 @@ g++ -I ../imgui main.cpp imgui_impl_a5.cpp ../imgui/imgui*.cpp -lallegro -lalleg - On Windows with Visual Studio's CLI -\ is your allegro5 folder. - ``` -cl /MD /I /I ..\imgui main.cpp imgui_impl_a5.cpp ..\imgui\imgui*.cpp /link /LIBPATH: allegro-5.0.10-monolith-md.lib user32.lib +set ALLEGRODIR=path_to_your_allegro5_folder +cl /Zi /MD /I %ALLEGRODIR%\include /I ..\.. main.cpp imgui_impl_a5.cpp ..\..\imgui*.cpp /link /LIBPATH:%ALLEGRODIR%\lib allegro-5.0.10-monolith-md.lib user32.lib ``` diff --git a/examples/opengl3_example/build_win32.bat b/examples/opengl3_example/build_win32.bat index 9cb86e0b..93115918 100644 --- a/examples/opengl3_example/build_win32.bat +++ b/examples/opengl3_example/build_win32.bat @@ -1,3 +1,3 @@ @REM Build for Visual Studio compiler. Run your copy of vcvars32.bat or vcvarsall.bat to setup command-line compiler. mkdir Debug -cl /nologo /Zi /MD /I ..\.. -I ..\libs\glfw\include -I ..\libs\gl3w *.cpp ..\..\*.cpp ..\libs\gl3w\GL\gl3w.c /FeDebug/opengl_example3.exe /FoDebug/ /link /LIBPATH:..\libs\glfw\lib-vc2010-32 glfw3.lib opengl32.lib gdi32.lib shell32.lib +cl /nologo /Zi /MD /I ..\.. /I ..\libs\glfw\include /I ..\libs\gl3w *.cpp ..\..\imgui*.cpp ..\libs\gl3w\GL\gl3w.c /FeDebug/opengl_example3.exe /FoDebug/ /link /LIBPATH:..\libs\glfw\lib-vc2010-32 glfw3.lib opengl32.lib gdi32.lib shell32.lib diff --git a/examples/opengl_example/build_win32.bat b/examples/opengl_example/build_win32.bat index a214a4b8..278381c7 100644 --- a/examples/opengl_example/build_win32.bat +++ b/examples/opengl_example/build_win32.bat @@ -1,3 +1,3 @@ @REM Build for Visual Studio compiler. Run your copy of vcvars32.bat or vcvarsall.bat to setup command-line compiler. mkdir Debug -cl /nologo /Zi /MD /I ..\.. -I ..\libs\glfw\include *.cpp ..\..\*.cpp /FeDebug/opengl_example.exe /FoDebug/ /link /LIBPATH:..\libs\glfw\lib-vc2010-32 glfw3.lib opengl32.lib gdi32.lib shell32.lib +cl /nologo /Zi /MD /I ..\.. /I ..\libs\glfw\include *.cpp ..\..\*.cpp /FeDebug/opengl_example.exe /FoDebug/ /link /LIBPATH:..\libs\glfw\lib-vc2010-32 glfw3.lib opengl32.lib gdi32.lib shell32.lib diff --git a/examples/sdl_opengl_example/README.md b/examples/sdl_opengl_example/README.md index d89ebb45..aada45d6 100644 --- a/examples/sdl_opengl_example/README.md +++ b/examples/sdl_opengl_example/README.md @@ -3,10 +3,9 @@ - On Windows with Visual Studio's CLI -\ is your SDL2 folder. - ``` -cl /MD /I /I ..\.. main.cpp imgui_impl_sdl.cpp ..\..\imgui*.cpp /link /LIBPATH: SDL2.lib SDL2main.lib +set SDL2DIR=path_to_your_sdl2_folder +cl /Zi /MD /I %SDL2DIR%\include> /I ..\.. main.cpp imgui_impl_sdl.cpp ..\..\imgui*.cpp /link /LIBPATH:%SDL2DIR%\lib SDL2.lib SDL2main.lib ``` - On Linux and similar Unixes