Partial OSX support

[xonotic/netradiant.git] / Makefile

diff --git a/Makefile b/Makefile
index 1fe334df7457a43184c1335cc3792db9e32e03fe..879e8d64756b8fb9c5bce47c06de9d678a7450b2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -113,15 +113,15 @@ CFLAGS_COMMON = -MMD -W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter -fn
 CPPFLAGS_COMMON =
 LDFLAGS_COMMON =
 LIBS_COMMON =
-CXXFLAGS_COMMON = -Wno-non-virtual-dtor -Wreorder -fno-exceptions -fno-rtti
+CXXFLAGS_COMMON = -Wno-non-virtual-dtor -Wreorder -fno-exceptions -fno-rtti -std=c++11
 
 ifeq ($(BUILD),debug)
 ifeq ($(findstring $(CFLAGS),-g),)
        CFLAGS_COMMON += -g
        # only add -g if no -g flag is in $(CFLAGS)
 endif
-ifeq ($(findstring $(CFLAGS),-O),)
-       CFLAGS_COMMON += -O
+ifeq ($(findstring $(CFLAGS),-O0),)
+       CFLAGS_COMMON += -O0
        # only add -O if no -O flag is in $(CFLAGS)
 endif
        CPPFLAGS_COMMON +=
@@ -142,8 +142,8 @@ ifeq ($(findstring $(CFLAGS),-g),)
        CFLAGS_COMMON += -g
        # only add -g if no -g flag is in $(CFLAGS)
 endif
-ifeq ($(findstring $(CFLAGS),-O),)
-       CFLAGS_COMMON += -O
+ifeq ($(findstring $(CFLAGS),-O0),)
+       CFLAGS_COMMON += -O0
        # only add -O if no -O flag is in $(CFLAGS)
 endif
        CFLAGS_COMMON += -pg
@@ -534,6 +534,7 @@ $(INSTALLDIR)/q3map2.$(EXE): \
        tools/quake3/q3map2/vis.o \
        tools/quake3/q3map2/writebsp.o \
        libddslib.$(A) \
+       libetclib.$(A) \
        libfilematch.$(A) \
        libl_net.$(A) \
        libmathlib.$(A) \
@@ -583,6 +584,10 @@ libddslib.$(A): CPPFLAGS_EXTRA := -Ilibs
 libddslib.$(A): \
        libs/ddslib/ddslib.o \
 
+libetclib.$(A): CPPFLAGS_EXTRA := -Ilibs
+libetclib.$(A): \
+       libs/etclib.o \
+
 $(INSTALLDIR)/q3data.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_ZLIB)
 $(INSTALLDIR)/q3data.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_ZLIB) -Itools/quake3/common -Ilibs -Iinclude
 $(INSTALLDIR)/q3data.$(EXE): \
@@ -607,6 +612,7 @@ $(INSTALLDIR)/q3data.$(EXE): \
        tools/quake3/q3data/stripper.o \
        tools/quake3/q3data/video.o \
        libfilematch.$(A) \
+       libetclib.$(A) \
        libl_net.$(A) \
        libmathlib.$(A) \
        $(if $(findstring $(OS),Win32),icons/q3data.o,) \
@@ -654,7 +660,7 @@ $(INSTALLDIR)/radiant.$(EXE): \
        radiant/mainframe.o \
        radiant/main.o \
        radiant/map.o \
-       $(if $(findstring $(OS),Win32),radiant/multimon.o,) \
+       radiant/multimon.o \
        radiant/mru.o \
        radiant/nullmodel.o \
        radiant/parse.o \
@@ -801,9 +807,11 @@ $(INSTALLDIR)/modules/image.$(DLL): \
        plugins/image/dds.o \
        plugins/image/image.o \
        plugins/image/jpeg.o \
+       plugins/image/ktx.o \
        plugins/image/pcx.o \
        plugins/image/tga.o \
        libddslib.$(A) \
+       libetclib.$(A) \
 
 $(INSTALLDIR)/modules/imageq2.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude
 $(INSTALLDIR)/modules/imageq2.$(DLL): \