Merge branch 'master' into sdl2.0
This commit is contained in:
commit
c3cce36fc0
27 changed files with 219 additions and 327 deletions
1
Makefile
1
Makefile
|
|
@ -1355,7 +1355,6 @@ beos_MAGIC_ARCH_LINKS:=-lintl $(PNG)
|
|||
linux_MAGIC_ARCH_LINKS:=-lintl $(PNG)
|
||||
MAGIC_ARCH_LINKS:=$($(OS)_MAGIC_ARCH_LINKS)
|
||||
|
||||
|
||||
windows_PLUGIN_LIBS:=$(MAGIC_SDL_LIBS) $(MAGIC_ARCH_LINKS)
|
||||
macos_PLUGIN_LIBS:=$(MAGIC_SDL_LIBS) $(MAGIC_ARCH_LINKS)
|
||||
ios_PLUGIN_LIBS:=$(MAGIC_SDL_LIBS) $(MAGIC_ARCH_LINKS)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue