Skip to content

Commit

Permalink
quote paths, don't default to cwd for MSVC path (see #28)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Aurel300
Aurel300 committed Feb 25, 2020
1 parent 6b74a0a commit 85ad75e
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 23 deletions.
7 changes: 5 additions & 2 deletions src/ammer/Config.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,12 @@ class Config {
null;
});
useMSVC = getBool("ammer.msvc", Sys.systemName() == "Windows");
pathMSVC = getPath("ammer.msvcPath", "");
if (pathMSVC != "" && pathMSVC.substr(-1) != "/")
pathMSVC = getPath("ammer.msvcPath");
if (pathMSVC == null) {
pathMSVC = "";
} else if (pathMSVC != "" && pathMSVC.substr(-1) != "/") {
pathMSVC += "/";
}

// create platform-specific config
switch (platform) {
Expand Down
6 changes: 3 additions & 3 deletions src/ammer/build/BuildEval.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ class BuildEval {
lb.ai('ammer_${library.name}.cmo: ammer_${library.name}.eval.o\n');
lb.indent(() -> {
lb.ai('$$(COMPILER) $$(ALL_CFLAGS) \\\n');
lb.ai('-cclib ammer_${library.name}.eval.o -cclib -L${library.libraryPath} -cclib -l${library.name} \\\n');
lb.ai('-cclib ammer_${library.name}.eval.o -cclib -L"${library.libraryPath}" -cclib -l${library.name} \\\n');
lb.ai('-o ammer_${library.name}.cmo ammer_${library.name}.ml\n');
}, "\t");
lb.ai('ammer_${library.name}.cmxs: ammer_${library.name}.eval.o\n');
lb.indent(() -> {
lb.ai('$$(COMPILER) $$(ALL_CFLAGS) \\\n');
lb.ai('-cclib ammer_${library.name}.eval.o -cclib -L${library.libraryPath} -cclib -l${library.name} \\\n');
lb.ai('-cclib ammer_${library.name}.eval.o -cclib -L"${library.libraryPath}" -cclib -l${library.name} \\\n');
lb.ai('-shared -o ammer_${library.name}.cmxs ammer_${library.name}.ml\n');
}, "\t");
var compiler = (switch (library.abi) {
Expand All @@ -36,7 +36,7 @@ class BuildEval {
});
lb.ai('ammer_${library.name}.eval.o: ammer_${library.name}.eval.c\n');
lb.indent(() -> {
lb.ai('$compiler $$(ALL_CFLAGS) ammer_${library.name}.eval.c -I ${library.includePath}\n');
lb.ai('$compiler $$(ALL_CFLAGS) ammer_${library.name}.eval.c -I "${library.includePath}"\n');
}, "\t");
}
Utils.update('${config.eval.build}/Makefile.eval.ammer', lb.dump());
Expand Down
18 changes: 9 additions & 9 deletions src/ammer/build/BuildHl.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,29 @@ class BuildHl {
lb.indent(() -> {
lb.ai('${config.pathMSVC}cl /LD ammer_${library.name}.hl.obj /DLIBHL_EXPORTS /link /OUT:ammer_${library.name}.hdll');
if (config.hl.hlLibraryPath != null)
lb.a(' /LIBPATH:${config.hl.hlLibraryPath}');
lb.a(' libhl.lib /LIBPATH:${library.libraryPath} ${library.name}.lib\n\n');
lb.a(' /LIBPATH:"${config.hl.hlLibraryPath}"');
lb.a(' libhl.lib /LIBPATH:"${library.libraryPath}" ${library.name}.lib\n\n');
}, "\t");
lb.ai('ammer_${library.name}.hl.obj: ammer_${library.name}.hl.${sourceExt}\n');
lb.indent(() -> {
lb.ai('${config.pathMSVC}cl /c ammer_${library.name}.hl.${sourceExt} /I ${library.includePath}');
lb.ai('${config.pathMSVC}cl /c ammer_${library.name}.hl.${sourceExt} /I "${library.includePath}"');
if (config.hl.hlIncludePath != null)
lb.a(' /I ${config.hl.hlIncludePath}');
lb.a(' /I "${config.hl.hlIncludePath}"');
lb.a('\n\n');
}, "\t");
} else {
lb.ai('ammer_${library.name}.hdll: ammer_${library.name}.hl.o\n');
lb.indent(() -> {
lb.ai('$compiler $$(CFLAGS) -I ${library.includePath} -D LIBHL_EXPORTS -m64 -shared -o ammer_${library.name}.hdll ammer_${library.name}.hl.o');
lb.ai('$compiler $$(CFLAGS) -I "${library.includePath}" -D LIBHL_EXPORTS -m64 -shared -o ammer_${library.name}.hdll ammer_${library.name}.hl.o');
if (config.hl.hlLibraryPath != null)
lb.a(' -L${config.hl.hlLibraryPath}');
lb.a(' -lhl -L${library.libraryPath} -l${library.name}\n\n');
lb.a(' -L"${config.hl.hlLibraryPath}"');
lb.a(' -lhl -L"${library.libraryPath}" -l${library.name}\n\n');
}, "\t");
lb.ai('ammer_${library.name}.hl.o: ammer_${library.name}.hl.${sourceExt}\n');
lb.indent(() -> {
lb.ai('$compiler $$(CFLAGS) -fPIC -o ammer_${library.name}.hl.o -c ammer_${library.name}.hl.${sourceExt} -I ${library.includePath}');
lb.ai('$compiler $$(CFLAGS) -fPIC -o ammer_${library.name}.hl.o -c ammer_${library.name}.hl.${sourceExt} -I "${library.includePath}"');
if (config.hl.hlIncludePath != null)
lb.a(' -I ${config.hl.hlIncludePath}');
lb.a(' -I "${config.hl.hlIncludePath}"');
lb.a('\n\n');
}, "\t");
}
Expand Down
18 changes: 9 additions & 9 deletions src/ammer/build/BuildLua.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,30 +22,30 @@ class BuildLua {
lb.indent(() -> {
lb.ai('${config.pathMSVC}cl /LD ammer_${library.name}.lua.obj /link /OUT:ammer_${library.name}.dll');
if (config.lua.luaLibraryPath != null)
lb.a(' /LIBPATH:${config.lua.luaLibraryPath}');
lb.a(' liblua.lib /LIBPATH:${library.libraryPath} ${library.name}.lib\n\n');
lb.a(' /LIBPATH:"${config.lua.luaLibraryPath}"');
lb.a(' liblua.lib /LIBPATH:"${library.libraryPath}" ${library.name}.lib\n\n');
}, "\t");
lb.ai('ammer_${library.name}.lua.obj: ammer_${library.name}.lua.${sourceExt}\n');
lb.indent(() -> {
lb.ai('${config.pathMSVC}cl /c ammer_${library.name}.lua.${sourceExt} /I ${library.includePath}');
lb.ai('${config.pathMSVC}cl /c ammer_${library.name}.lua.${sourceExt} /I "${library.includePath}"');
if (config.lua.luaIncludePath != null)
lb.a(' /I ${config.lua.luaIncludePath}');
lb.a(' /I "${config.lua.luaIncludePath}"');
lb.a('\n\n');
}, "\t");
} else {
// TODO: dylib, so, dll depending on OS
lb.ai('ammer_${library.name}.dylib: ammer_${library.name}.lua.o\n');
lb.indent(() -> {
lb.ai('$compiler $$(CFLAGS) -dynamiclib -I ${library.includePath} -o ammer_${library.name}.dylib ammer_${library.name}.lua.o');
lb.ai('$compiler $$(CFLAGS) -dynamiclib -I "${library.includePath}" -o ammer_${library.name}.dylib ammer_${library.name}.lua.o');
if (config.lua.luaLibraryPath != null)
lb.a(' -L${config.lua.luaLibraryPath}');
lb.a(' -llua -L${library.libraryPath} -l${library.name}\n\n');
lb.a(' -L"${config.lua.luaLibraryPath}"');
lb.a(' -llua -L"${library.libraryPath}" -l${library.name}\n\n');
}, "\t");
lb.ai('ammer_${library.name}.lua.o: ammer_${library.name}.lua.${sourceExt}\n');
lb.indent(() -> {
lb.ai('$compiler $$(CFLAGS) -fPIC -o ammer_${library.name}.lua.o -c ammer_${library.name}.lua.${sourceExt} -I ${library.includePath}');
lb.ai('$compiler $$(CFLAGS) -fPIC -o ammer_${library.name}.lua.o -c ammer_${library.name}.lua.${sourceExt} -I "${library.includePath}"');
if (config.lua.luaIncludePath != null)
lb.a(' -I ${config.lua.luaIncludePath}');
lb.a(' -I "${config.lua.luaIncludePath}"');
lb.a('\n\n');
}, "\t");
}
Expand Down

0 comments on commit 85ad75e

Please sign in to comment.