Revision 1535

branches/threaded2merge/examples/threaded/mforest/Makefile (revision 1535)
13 13
CC=/usr/local/gcc-4.8.0/bin/g++
14 14
LL = $(CC)
15 15

  
16
CFLAGS = -c -pthread -fpermissive -m64 -Wall -Wno-deprecated -ggdb -I. -I$(ADMB_HOME)/include -D__GNUDOS__ -Dlinux -DUSE_LAPLACE -DSAFE_ARRAYS
16
CFLAGS = -c -pthread -m64 -Wall -ggdb -I. -I$(ADMB_HOME)/include -D__GNUDOS__ -Dlinux -DUSE_LAPLACE -DSAFE_ARRAYS
17 17

  
18 18
LFLAGS = -L$(ADMB_HOME)/lib -ladmb -lpthread
19 19
#LFLAGS = -L$(ADMB_HOME)/lib -ldf1b2s -ladmod -ladt -lads -ldf1b2s -ladmod -ladt -lads -ldf1b2s -ladmod -ladt -lads -lpthread
branches/threaded2merge/examples/threaded/mforest/mforest.tpl (revision 1535)
141 141
  }
142 142
  
143 143

  
144
  void funnel_loop(void* ptr)
144
  void* funnel_loop(void* ptr)
145 145
  {
146 146
      // cast the pointer to the proper type
147 147
      new_thread_data * tptr = (new_thread_data *) ptr;
branches/threaded2merge/examples/threaded/multisimple/msimple.tpl (revision 1535)
7 7

  
8 8
 
9 9
  // write the function to run on the threads
10
  void simple_thread(void * ptr)
10
  void* simple_thread(void * ptr)
11 11
  {
12 12
      // cast the pointer to the propper type
13 13
      new_thread_data * tptr = (new_thread_data *) ptr;
branches/threaded2merge/examples/threaded/multisimple/Makefile (revision 1535)
13 13
CC=/usr/local/gcc-4.8.0/bin/g++
14 14
LL = $(CC)
15 15

  
16
CFLAGS = -c -pthread -fpermissive -m64 -Wall -Wno-deprecated -ggdb -I. -I$(ADMB_HOME)/include -I$(ADMB_HOME)/contrib -D__GNUDOS__ -Dlinux -DUSE_LAPLACE -DSAFE_ARRAYS
17
#CFLAGS = -c -pthread -fpermissive -m64 -Wall -Wno-deprecated -ggdb -I. -I$(ADMB_HOME)/include -I$(ADMB_HOME)/contrib -D__GNUDOS__ -Dlinux -DUSE_LAPLACE -DOPT_LIB
16
CFLAGS = -c -pthread -m64 -Wall -ggdb -I. -I$(ADMB_HOME)/include -I$(ADMB_HOME)/contrib -D__GNUDOS__ -Dlinux -DUSE_LAPLACE -DSAFE_ARRAYS
18 17

  
19

  
20 18
LFLAGS = -L$(ADMB_HOME)/lib -ladmb -lpthread
21
#LFLAGS = -L$(ADMB_HOME)/lib -ldf1b2s -ladmod -ladt -lado -ldf1b2o -ladmod -ladt -lado -ldf1b2o -ladmod -ladt -lado -lpthread
22 19

  
23

  
24 20
all: msimple msimple-nothreads
25 21

  
26 22
%:%.o

Also available in: Unified diff