1
0
mirror of https://github.com/ocornut/imgui.git synced 2024-11-24 07:40:22 +01:00

Examples: Synced Makefile comments. Added build/ folder into git ignore list/

This commit is contained in:
omar 2018-01-29 00:38:00 +01:00
parent 858d75ab59
commit ddff378daf
4 changed files with 23 additions and 17 deletions

2
examples/.gitignore vendored
View File

@ -1,4 +1,4 @@
## Visual Studio files build/*
Debug/* Debug/*
Release/* Release/*
ipch/* ipch/*

View File

@ -2,10 +2,13 @@
# Cross Platform Makefile # Cross Platform Makefile
# Compatible with MSYS2/MINGW, Ubuntu 14.04.1 and Mac OS X # Compatible with MSYS2/MINGW, Ubuntu 14.04.1 and Mac OS X
# #
# # You will need GLFW (http://www.glfw.org):
# if you using Mac OS X: # Linux:
# You'll need glfw # apt-get install libglfw-dev
# http://www.glfw.org # Mac OS X:
# brew install glfw
# MSYS2:
# pacman -S --noconfirm --needed mingw-w64-x86_64-toolchain mingw-w64-x86_64-glfw
# #
#CXX = g++ #CXX = g++
@ -46,6 +49,7 @@ ifeq ($(findstring MINGW,$(UNAME_S)),MINGW)
CFLAGS = $(CXXFLAGS) CFLAGS = $(CXXFLAGS)
endif endif
.cpp.o: .cpp.o:
$(CXX) $(CXXFLAGS) -c -o $@ $< $(CXX) $(CXXFLAGS) -c -o $@ $<

View File

@ -2,12 +2,13 @@
# Cross Platform Makefile # Cross Platform Makefile
# Compatible with MSYS2/MINGW, Ubuntu 14.04.1 and Mac OS X # Compatible with MSYS2/MINGW, Ubuntu 14.04.1 and Mac OS X
# #
# # You will need GLFW (http://www.glfw.org):
# You will need GLFW (http://www.glfw.org) # Linux:
# # apt-get install libglfw-dev
# apt-get install libglfw-dev # Linux # Mac OS X:
# brew install glfw # Mac OS X # brew install glfw
# pacman -S --noconfirm --needed mingw-w64-x86_64-toolchain mingw-w64-x86_64-glfw # MSYS2 # MSYS2:
# pacman -S --noconfirm --needed mingw-w64-x86_64-toolchain mingw-w64-x86_64-glfw
# #
#CXX = g++ #CXX = g++

View File

@ -2,12 +2,13 @@
# Cross Platform Makefile # Cross Platform Makefile
# Compatible with MSYS2/MINGW, Ubuntu 14.04.1 and Mac OS X # Compatible with MSYS2/MINGW, Ubuntu 14.04.1 and Mac OS X
# #
# # You will need SDL2 (http://www.libsdl.org):
# You will need SDL2 (http://www.libsdl.org) # Linux:
# # apt-get install libsdl2-dev
# apt-get install libsdl2-dev # Linux # Mac OS X:
# brew install sdl2 # Mac OS X # brew install sdl2
# pacman -S mingw-w64-i686-SDL # MSYS2 # MSYS2:
# pacman -S mingw-w64-i686-SDL
# #
#CXX = g++ #CXX = g++