Commit 77e96ead authored by John van Groningen's avatar John van Groningen
Browse files

Merge branch 'windows-fixes' into 'master'

Windows fixes

See merge request !10
parents a5a4e1c0 6fb24479
Pipeline #45918 passed with stage
in 17 seconds
......@@ -98,7 +98,7 @@ extern char *getenv();
#if defined (I486) && !defined (LINUX)
# ifdef _WINDOWS_
char clean_lib_directory[PATH_NAME_STRING_SIZE] = "C:\\Clean";
char clean_directory_list[PATH_NAME_STRING_SIZE] = "C:\\Clean\\Libraries\\StdEnv";
char clean_directory_list[PATH_LIST_STRING_SIZE] = "C:\\Clean\\Libraries\\StdEnv";
char clean_include_library_directory[PATH_NAME_STRING_SIZE] = "C:\\Clean\\Libraries";
char assembler_file_name[PATH_NAME_STRING_SIZE] = "as.exe";
# ifndef USE_WLINK
......@@ -1097,14 +1097,24 @@ static void add_imported_object_file_to_project_node (char *object_file_name,P_N
add_object_file_extension=0;
if (object_file_name_size>0 && object_file_name[object_file_name_size-1]=='.'){
add_object_file_extension=1;
#if defined(_WINDOWS_) && defined(A_64)
object_file_name_size+=3;
#else
++object_file_name_size;
#endif
}
new_imported_object_file=memory_allocate (sizeof (struct object_file_list)+object_file_name_size+1);
strcpy (new_imported_object_file->object_file_name,object_file_name);
if (add_object_file_extension){
#if defined(_WINDOWS_) && defined(A_64)
new_imported_object_file->object_file_name[object_file_name_size-3]='o';
new_imported_object_file->object_file_name[object_file_name_size-2]='b';
new_imported_object_file->object_file_name[object_file_name_size-1]='j';
#else
new_imported_object_file->object_file_name[object_file_name_size-1]='o';
#endif
new_imported_object_file->object_file_name[object_file_name_size]='\0';
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment