echoes91
/
pioneer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automake: update to include imgui and nanosvg 

Nanosvg: Add to contrib for generating icons from svg
master
Peter 2016-10-06 19:24:19 +02:00
parent 3422c87f7f
commit 2226179222
6 changed files with 4314 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -420,7 +420,8 @@ AC_CONFIG_FILES([
contrib/lua/Makefile
contrib/miniz/Makefile
contrib/jenkins/Makefile
contrib/imgui/Makefile
contrib/imgui/Makefile
contrib/nanosvg/Makefile
contrib/json/Makefile
contrib/PicoDDS/Makefile
contrib/vcacheopt/Makefile

2
contrib/imgui/Makefile.am
View File

@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.common
AM_CFLAGS += $(SDL2_CFLAGS)
CPPFLAGS+="-Iexamples/libs/gl3w/"
AM_CPPFLAGS += -I$(top_srcdir)/contrib/imgui -I$(top_srcdir)/contrib/imgui/examples/libs/gl3w/ -I$(top_srcdir)/src/
noinst_LIBRARIES = libimgui.a
libimgui_a_SOURCES = imgui.cpp imgui_draw.cpp examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
noinst_HEADERS = imgui.h examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h

9
contrib/nanosvg/Makefile.am Normal file
View File

@ -0,0 +1,9 @@
# Process this file with automake to produce Makefile.in
include $(top_srcdir)/Makefile.common
AM_CFLAGS += $(SDL2_CFLAGS)
AM_CPPFLAGS += "-I$(top_srcdir)/contrib/nanosvg"
# noinst_LIBRARIES = libimgui.a
# libimgui_a_SOURCES = imgui.cpp imgui_draw.cpp examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
noinst_HEADERS = nanosvg.h nanosvgrast.h

2849
contrib/nanosvg/nanosvg.h Normal file
View File

File diff suppressed because it is too large Load Diff

1447
contrib/nanosvg/nanosvgrast.h Normal file
View File

File diff suppressed because it is too large Load Diff

7
src/Makefile.am
View File

@ -74,6 +74,7 @@ noinst_HEADERS = \
LuaMusic.h \
LuaNameGen.h \
LuaObject.h \
LuaPiGui.h \
LuaPushPull.h \
LuaRef.h \
LuaSerializer.h \
@ -97,6 +98,7 @@ noinst_HEADERS = \
OS.h \
PersistSystemData.h \
Pi.h \
PiGui.h \
Plane.h \
Planet.h \
Player.h \
@ -216,6 +218,7 @@ pioneer_SOURCES = \
LuaMusic.cpp \
LuaNameGen.cpp \
LuaObject.cpp \
LuaPiGui.cpp \
LuaPlanet.cpp \
LuaPlayer.cpp \
LuaPropertiedObject.cpp \
@ -243,6 +246,7 @@ pioneer_SOURCES = \
ObjectViewerView.cpp \
Orbit.cpp \
Pi.cpp \
PiGui.cpp \
Plane.cpp \
Planet.cpp \
Player.cpp \
@ -301,7 +305,8 @@ pioneer_LDADD = \
../contrib/PicoDDS/libpicodds.a \
../contrib/jenkins/libjenkins.a \
../contrib/json/libjson.a \
../contrib/profiler/libprofiler.a
../contrib/profiler/libprofiler.a \
../contrib/imgui/libimgui.a
pioneer_LDADD += \
$(FREETYPE_LIBS) $(GL_LIBS) \