Merge remote-tracking branch 'origin/master' into testing

This commit is contained in:
DarthArgus
2016-01-31 12:00:39 -06:00
@@ -255,7 +255,7 @@ add_custom_command(
OUTPUT ${SCHEMA_H_OUTPUT_NATIVE}
COMMAND ${CMAKE_COMMAND} -E copy ${SCHEMA_H_TEMPLATE_NATIVE} ${SCHEMA_H_OUTPUT_NATIVE}
COMMAND ${PERL_EXECUTABLE} "${MAKE_SCHEMA_H}" --ddldirectory "${SWG_GAME_SOURCE_DIR}/server/database/schema" --output "${SCHEMA_H_OUTPUT_NATIVE}" ${WINDOWS_PLATFORM}
DEPENDS ${SCHEMA_H_OUTPUT_NATIVE} ${MAKE_SCHEMA_H}
DEPENDS ${SCHEMA_H_TEMPLATE_NATIVE} ${MAKE_SCHEMA_H}
)
add_custom_command(