Skip to content

Commit

Permalink
Removed nanovg
Browse files Browse the repository at this point in the history
Possible cause of pains, plus it isn't used (yet)
  • Loading branch information
IceDragon200 committed May 19, 2015
1 parent 3afb5da commit 8c67356
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 41 deletions.
5 changes: 0 additions & 5 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,3 @@
[submodule "vendor/gorilla-audio"]
path = vendor/gorilla-audio
url = https://github.com/IceDragon200/gorilla-audio.git

[submodule "vendor/nanovg"]
path = vendor/nanovg
url = https://github.com/IceDragon200/nanovg.git
branch = static-stb_image
4 changes: 0 additions & 4 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ load 'tasks/freetype-gl.rake'
load 'tasks/glfw.rake'
load 'tasks/gorilla-audio.rake'
load 'tasks/mruby.rake'
load 'tasks/nanovg.rake'
load 'tasks/sil.rake'
load 'tasks/soil.rake'

Expand All @@ -20,7 +19,6 @@ task clean: [
'glfw:clean',
'gorilla-audio:clean',
'mruby:clean',
'nanovg:clean',
'sil:clean',
'soil:clean'
]
Expand All @@ -30,7 +28,6 @@ task hard_clean: [
'glfw:hard_clean',
'gorilla-audio:hard_clean',
'mruby:hard_clean',
'nanovg:hard_clean',
'sil:hard_clean',
'soil:hard_clean'
]
Expand All @@ -40,7 +37,6 @@ task build: [
'glfw:build',
'gorilla-audio:build',
'mruby:build',
'nanovg:build',
'sil:build',
'soil:build'
]
Expand Down
13 changes: 3 additions & 10 deletions mrb_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

puts "\t\\\\ Using #{toolchain_name} Toolchain \\\\"

# Full backtraces
conf.enable_debug

# include the default GEMs
conf.gembox 'default'
conf.gembox File.join(File.dirname(__FILE__), 'modules/moon')

# Full backtraces
conf.enable_debug

conf.gem core: 'mruby-eval'
conf.gem core: 'mruby-bin-debugger'
conf.gem github: 'iij/mruby-io' # General IO stuff, File system blah de dah.
Expand All @@ -25,7 +25,6 @@
conf.gem github: 'AndrewBelt/mruby-yaml' # YAML :3
conf.gem github: 'IceDragon200/mruby-glew' # GLEW
conf.gem github: 'IceDragon200/mruby-glfw3' # GLFW
conf.gem github: 'IceDragon200/mruby-nanovg' # nanovg

conf.cxx do |c|
std = 'c++11'
Expand Down Expand Up @@ -67,9 +66,6 @@
c.defines << 'MOON_GL_GLEW'
end

# use a GLES2 context for mruby-nanovg
c.flags << "-DMRUBY_NANOVG_GLES2=1"

# enable mruby-yaml: null, Null and NULL
c.flags << "-DMRUBY_YAML_NULL=1"
# disable all the extra mruby-yaml aliases, this makes it more like ruby
Expand All @@ -92,7 +88,6 @@
c.include_paths << File.join(vd, 'soil/include')
c.include_paths << File.join(vd, 'sil/include')
c.include_paths << File.join(vd, 'freetype-gl')
c.include_paths << File.join(vd, 'nanovg/src')
# required audio includes
c.include_paths << File.join(vd, 'gorilla-audio/include')
end
Expand All @@ -101,13 +96,11 @@
l.library_paths << File.join(vd, 'glfw/build/src')
l.library_paths << File.join(vd, 'freetype-gl/build')
l.library_paths << File.join(vd, 'gorilla-audio/build/build')
l.library_paths << File.join(vd, 'nanovg/build')
l.library_paths << File.join(vd, 'sil/build')
l.library_paths << File.join(vd, 'soil/build')
l.libraries << 'glfw'
l.libraries << 'freetype-gl'
l.libraries << 'gorilla'
l.libraries << 'nanovg'
l.libraries << 'freetype'
l.libraries << 'SOIL'
l.libraries << 'SIL'
Expand Down
1 change: 0 additions & 1 deletion tasks/mruby.rake
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ namespace :mruby do
'glfw:build',
'soil:build',
'freetype-gl:build',
'nanovg:build',
'gorilla-audio:build',
:build_mruby
]
Expand Down
20 changes: 0 additions & 20 deletions tasks/nanovg.rake

This file was deleted.

1 change: 0 additions & 1 deletion vendor/nanovg
Submodule nanovg deleted from 3a5e25

0 comments on commit 8c67356

Please sign in to comment.