From 56eeada36061929ab822dc587947efaf2de9c1db Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sun, 2 Sep 2018 20:34:09 -1000 Subject: [PATCH] Windows fixes --- DataSpec/DNAMP1/SFX/CMakeLists.txt | 6 ++++-- amuse | 2 +- hecl | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/DataSpec/DNAMP1/SFX/CMakeLists.txt b/DataSpec/DNAMP1/SFX/CMakeLists.txt index 0b9421ee4..a6cb903f4 100644 --- a/DataSpec/DNAMP1/SFX/CMakeLists.txt +++ b/DataSpec/DNAMP1/SFX/CMakeLists.txt @@ -1,7 +1,7 @@ unset(DNAMP1_SFX_SOURCES) macro(add_sfx_header HEADER SYMBOL) - bintoc("DNAMP1/SFX/${SYMBOL}.cpp" "DNAMP1/SFX/${HEADER}" "${SYMBOL}") - list(APPEND DNAMP1_SFX_SOURCES "DNAMP1/SFX/${SYMBOL}.cpp") + bintoc("DNAMP1/SFX/${SYMBOL}.cpp" "DNAMP1/SFX/${HEADER}" "${SYMBOL}") + list(APPEND DNAMP1_SFX_SOURCES "DNAMP1/SFX/${SYMBOL}.cpp" "DNAMP1/SFX/${HEADER}") endmacro(add_sfx_header) add_sfx_header(Atomic.h Atomic_H) @@ -75,3 +75,5 @@ add_sfx_header(ZZZ.h ZZZ_H) add_sfx_header(Zoomer.h Zoomer_H) add_sfx_header(lumigek.h lumigek_H) add_sfx_header(test.h test_H) + +list(APPEND DNAMP1_SFX_SOURCES "DNAMP1/SFX/SFX.h") diff --git a/amuse b/amuse index 1312a5fa8..8fee7a282 160000 --- a/amuse +++ b/amuse @@ -1 +1 @@ -Subproject commit 1312a5fa86916f632bee793e6afe410b8ee956ab +Subproject commit 8fee7a282be5a6a69dd534df2aefd9503b81ff0e diff --git a/hecl b/hecl index 3f36c1395..2366c8f67 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 3f36c1395f0f2b2514f7973d8b52de36f004c0c0 +Subproject commit 2366c8f672cc79bf534167095935baa1a97d9922