Skip to content

Commit

Permalink
Watcom generator fixes
Browse files Browse the repository at this point in the history
Added messages on link phases. Made output consistent on MacOSX and Windows for Watcom generation
  • Loading branch information
burgerbecky committed Aug 17, 2024
1 parent 6a2d258 commit a22959f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion makeprojects/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
########################################

# Current version of the library as a numeric tuple
__numversion__ = (0, 15, 3)
__numversion__ = (0, 15, 4)

# Current version of the library
__version__ = ".".join([str(num) for num in __numversion__])
Expand Down
9 changes: 8 additions & 1 deletion makeprojects/watcom.py
Original file line number Diff line number Diff line change
Expand Up @@ -1045,7 +1045,10 @@ def _setlinkerflags(self, line_list):
# Use the watcom libp command if needed
if lib_list:
entries.append("libp")
entries.append(";".join([fixup_env(x) for x in lib_list]))
entries.append(
";".join(
[convert_to_linux_slashes(fixup_env(x))
for x in lib_list]))

# Is there a list of libraries to link in?
lib_list = configuration.get_unique_chained_list(
Expand Down Expand Up @@ -1341,6 +1344,7 @@ def write_builds(self, line_list, has_rez):

line_list.extend([
"\t@SET WOW=$+$(OBJS)$-",
"\t@echo Creating library...",
"\t@WLIB -q -b -c -n $^@ @WOW"
])

Expand All @@ -1359,13 +1363,16 @@ def write_builds(self, line_list, has_rez):
else:
line_list.extend([
"\t@SET WOW={$+$(OBJS)$-}",
"\t@echo Performing link...",
"\t@$(LINK) $(LFlags" + configuration.name + \
configuration.platform.get_short_code() + ") "
"NAME $^@ FILE @wow"
])

# If there's a resource file, add it to the exe
if rc_objs:
line_list.append(
"\t@echo Performing resource linking...")
line_list.append(
"\t@WRC -q -bt=nt $+$(RC_OBJS)$- $^@")

Expand Down

0 comments on commit a22959f

Please sign in to comment.