Skip to content

Commit

Permalink
i#3613: Fix asm include paths for Visual Studio generators (#3656)
Browse files Browse the repository at this point in the history
Fixes the include paths for asm files that were moved to core/drlibc/ for Visual Studio generators.
These generators are not able to use include_directories() due to a custom_command.

Fixes #3613
  • Loading branch information
deroko authored and derekbruening committed Jun 3, 2019
1 parent 3fcec86 commit 2430084
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions core/drlibc/drlibc_x86.asm
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
* See comments in x86.asm on the format here.
*/

#include "../asm_defines.asm"
#include "x86_asm_defines.asm" /* PUSHGPR, POPGPR, etc. */
#include "../arch/asm_defines.asm"
#include "../arch/x86/x86_asm_defines.asm" /* PUSHGPR, POPGPR, etc. */
#ifdef MACOS
# include "include/syscall_mach.h" /* SYSCALL_NUM_MARKER_MACH */
#endif
Expand Down
2 changes: 1 addition & 1 deletion core/drlibc/drlibc_xarch.asm
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
* cross-platform assembly and trampoline code
*/

#include "asm_defines.asm"
#include "../arch/asm_defines.asm"
START_FILE

DECL_EXTERN(d_r_internal_error)
Expand Down

0 comments on commit 2430084

Please sign in to comment.