Skip to content

Commit 81223f6

Browse files
committed
fixes to build, note the source changes
1 parent cc78562 commit 81223f6

4 files changed

Lines changed: 5 additions & 4 deletions

File tree

src/amuse/community/arepo/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ worker_code.h: interface.py
3636
$(CODE_GENERATOR) --type=H interface.py ArepoInterface -o $@
3737

3838
arepo_worker: worker_code.cc worker_code.h $(CODELIB) $(OBJS)
39-
$(MPICXX) $(CXXFLAGS) $< $(OBJS) $(CODELIB) -o $@
39+
$(MPICXX) $(CXXFLAGS) $(GSL_FLAGS) $(GMP_LIBS) $(GSL_LIBS) $< $(OBJS) $(CODELIB) -o $@
4040

4141
.cc.o: $<
4242
$(MPICXX) $(CXXFLAGS) $(CODELIB) -c -o $@ $<

src/amuse/community/arepo/src/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@ LDFLAGS += -lm $(MUSE_LD_FLAGS)
1616
CODELIB = libarepo.a
1717

1818
SUBDIR = add_backgroundgrid cooling debug_md5 domain fof gitversion gravity \
19-
hydro init io main mesh mpi_utils ngbtree star_formation subfind \
19+
hydro init io mesh mesh/voronoi mpi_utils ngbtree star_formation subfind \
2020
time_integration utils
2121
SRCS = $(foreach fd, $(SUBDIR), $(wildcard $(fd)/*.c))
2222

2323
CODEOBJS = $(SRCS:c=o)
24+
CODEOBJS += main/allvars.o main/run.o main/main.o
2425

2526
AR = ar ruv
2627
RANLIB = ranlib

src/amuse/community/arepo/src/init/begrun.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void begrun0(void)
8484

8585
if(ThisTask == 0)
8686
{
87-
output_compile_time_options();
87+
// output_compile_time_options();
8888
}
8989
}
9090

src/amuse/community/arepo/src/main/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
*
5959
* \return status of exit; 0 for normal exit.
6060
*/
61-
int main(int argc, char **argv)
61+
int no_main(int argc, char **argv)
6262
{
6363
// #ifdef IMPOSE_PINNING
6464
// detect_topology();

0 commit comments

Comments
 (0)