dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Refactored preprocessor instructions to separate source file

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6855 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2017-05-03 12:08:09 +00:00
parent 7ecff5e1c0
commit 17d5e5003f
14 changed files with 1451 additions and 1415 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/makenssi.cpp
View file

@ -543,7 +543,7 @@ static inline int makensismain(int argc, TCHAR **argv)
}
else if (S7IsChEqualI('x',swname[0]) && swname[1])
{
if (build.process_oneline(swname+1,_T("<command line>"),argpos+1) != PS_OK)
if (build.process_oneline(swname+1,build.get_commandlinecode_filename(),argpos+1) != PS_OK)
{
return 1;
}
@ -567,7 +567,7 @@ static inline int makensismain(int argc, TCHAR **argv)
noconfig=true;
tstring main_conf;
TCHAR* env_var = _tgetenv(_T("NSISCONFDIR"));
if(env_var == NULL)
if (env_var == NULL)
#ifndef NSIS_CONFIG_CONST_DATA_PATH
main_conf = get_dir_name(get_executable_dir(argv[0]));
#else