summaryrefslogtreecommitdiffstatshomepage
path: root/makefile
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-02-27 16:53:15 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-02-27 16:53:49 +0100
commitea6b85484430067af34bef8227d7c2ad2da03306 (patch)
tree5051eeeb3aefc0d0cc922cb863433f1bbd2a11da /makefile
parentcf6dc7d370407914020f3e623719f09c8668c692 (diff)
Made Visual Studio use by default bundled SDL2 (nw)
Diffstat (limited to 'makefile')
-rw-r--r--makefile14
1 files changed, 13 insertions, 1 deletions
diff --git a/makefile b/makefile
index f8dec40fcff..b792c7f7a52 100644
--- a/makefile
+++ b/makefile
@@ -62,6 +62,7 @@
# USE_SYSTEM_LIB_SQLITE3 = 1
# USE_SYSTEM_LIB_PORTMIDI = 1
# USE_SYSTEM_LIB_PORTAUDIO = 1
+# USE_BOUNDLED_LIB_SDL2 = 1
# MESA_INSTALL_ROOT = /opt/mesa
# SDL_INSTALL_ROOT = /opt/sdl2
@@ -383,6 +384,12 @@ ifndef USE_SYSTEM_LIB_PORTAUDIO
PARAMS += --with-bundled-portaudio
endif
+# reverse logic for this one
+
+ifdef USE_BOUNDLED_LIB_SDL2
+PARAMS += --with-bundled-sdl2
+endif
+
#-------------------------------------------------
# distribution may change things
#-------------------------------------------------
@@ -1338,7 +1345,12 @@ generate: \
$(GEN_FOLDERS) \
$(patsubst %.po,%.mo,$(call rwildcard, language/, *.po)) \
$(patsubst $(SRC)/%.lay,$(GENDIR)/%.lh,$(LAYOUTS)) \
- $(SRC)/devices/cpu/m68000/m68kops.cpp
+ $(SRC)/devices/cpu/m68000/m68kops.cpp \
+ $(GENDIR)/includes/SDL2
+
+$(GENDIR)/includes/SDL2:
+ -$(call MKDIR,$@)
+ $(SILENT)cp -fR 3rdparty/SDL2/include/* $(GENDIR)/includes/SDL2/.
$(GENDIR)/%.lh: $(SRC)/%.lay scripts/build/file2str.py | $(GEN_FOLDERS)
@echo Converting $<...