Commit 3029fca9 authored by Arnau Bago Castro's avatar Arnau Bago Castro
Browse files

Minor changes to build system

parent 5099339b

src/Makefile.am

+3 −1
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@ bin_PROGRAMS = dloom app 


dloom_SOURCES = dloom.cpp

#dloom_CXXFLAGS = $(CXXFLAGS) -I/usr/local/ -ltbb -std=gnu++11 -L tbb2017_20161128oss/lib/intel64/gcc4.7/

dloom_CXXFLAGS = -ltbb -std=gnu++11

dloom_CXXFLAGS = -I/usr/local/ -std=gnu++11

dloom_LDFLAGS = -L/usr/local

dloom_LDADD = -ltbb

norn_a_AR = $(CXX) -ar -o 



app_SOURCES = app.c norn.c

src/app.c

+0 −1
Original line number Diff line number Diff line 
#include <stdio.h>

#include "norn.h"



int main() {

   printf("Hello, World! I'm the app \n");

src/dloom.cpp

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <fstream>

#include <stdio.h>

#include <fcntl.h>

#include "CTPL-master/ctpl.h" 

#include "ctpl.h" 

#include <tbb/tbb.h>



#define SOCKET_NAME "dloom_socket"

src/norn.c

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
#include <sys/types.h>

#include <stdlib.h>

#include <stdint.h>

#include "norn.h"



#define SOCKET_NAME "dloom_socket"