Fix unique_ptr that holds an allocated array

[tidl/tidl-api.git] / viewer / Makefile

diff --git a/viewer/Makefile b/viewer/Makefile
index 4ea538467e01b763c192c1bcbdbebc13c5a96582..b5b0dfa2ab35e141a1a1fa8d6fdb475d62cb5848 100644 (file)
--- a/viewer/Makefile
+++ b/viewer/Makefile
@@ -30,24 +30,26 @@ EXE = $(TARGET)/tidl_viewer
 
 TIDL_API_DIR=../tidl_api
 
-# -m32 required on x86 to ensure consistent layout of struct sTIDL_Network_t
 ifeq ($(TARGET),x86)
-       CXX = g++
-       CXXFLAGS = -m32 -static
-       LDFLAGS =
+       CXX      ?= g++
+       CXXFLAGS += -static
 else
 include $(TIDL_API_DIR)/make.inc
 endif
 
+include $(TIDL_API_DIR)/make.buildid
+
 CXXFLAGS += -o3
 #CXXFLAGS += -g -ggdb
 CXXFLAGS += --std=c++11 -Wall -Werror
 CXXFLAGS += -Iinc -I$(TIDL_API_DIR)/inc -I$(TIDL_API_DIR)/src
+CXXFLAGS += $(BUILD_ID)
+
 SOURCES = main.cpp tidl_viewer.cpp dot_graph.cpp $(TIDL_API_DIR)/src/util.cpp
 
-$(EXE): $(TIDL_API_LIB) $(HEADERS) $(SOURCES)
+$(EXE): $(HEADERS) $(SOURCES)
        mkdir -p $(TARGET)
-       $(CXX) $(CXXFLAGS) $(SOURCES) $(TIDL_API_LIB) $(LDFLAGS) -o $@
+       $(CXX) $(CXXFLAGS) $(SOURCES) $(LDFLAGS) -o $@
 
 clean::
        $(RM) $(EXE) *.dot *.svg