mirror of
https://github.com/Drezil/imgui.git
synced 2024-11-15 01:17:00 +00:00
Examples: Synced Makefile comments. Added build/ folder into git ignore list/
This commit is contained in:
parent
858d75ab59
commit
ddff378daf
2
examples/.gitignore
vendored
2
examples/.gitignore
vendored
@ -1,4 +1,4 @@
|
|||||||
## Visual Studio files
|
build/*
|
||||||
Debug/*
|
Debug/*
|
||||||
Release/*
|
Release/*
|
||||||
ipch/*
|
ipch/*
|
||||||
|
@ -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 $@ $<
|
||||||
|
|
||||||
|
@ -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++
|
||||||
|
@ -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++
|
||||||
|
Loading…
Reference in New Issue
Block a user