Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde

This commit is contained in:
Phillip Stephens 2018-09-06 20:38:29 -07:00
commit 80bd235283
3 changed files with 6 additions and 4 deletions

View File

@ -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")

2
amuse

@ -1 +1 @@
Subproject commit 1312a5fa86916f632bee793e6afe410b8ee956ab
Subproject commit 25aacc95117b134016bba2b018039a274c7ffa65

2
hecl

@ -1 +1 @@
Subproject commit 3f36c1395f0f2b2514f7973d8b52de36f004c0c0
Subproject commit c68a8ddf0955d2dc283453c277da33d66868d9ac