Changeset 21394 for trunk/include

Timestamp:

Jul 27, 2010, 9:55:40 PM (15 years ago)

Author:

dmik

Message:

Use the .lrf file when generating .exe and .dll using EMX to overcome the command line length limitation.

File:

• trunk/include/odin32.post.emx.mk (modified) (3 diffs)

trunk/include/odin32.post.emx.mk

@@ -133 +133 @@
 $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(LIBS) $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\bldlevel.$(ORGDEFFILE) $(OBJDIR)\$(TARGET).lrf
     $(CMDQD_WAIT)
+!ifndef NO_LNKFILE_RULE
+    $(LD2) $(LD2FLAGS) $(OBJ_PROFILE) @$(OBJDIR)\$(TARGET).lrf
+!else    
     $(LD2) $(LD2FLAGS) $(OBJ_PROFILE) -o $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION) $(OBJS) $(LIB_PROFILE) $(LIBS) $(OBJDIR)\bldlevel.$(ORGDEFFILE)
-
+!endif
 !ifdef OS2RES
     $(OS2RC) $(OS2RCLFLAGS) $(OS2RES) $@
@@ -149 +152 @@
 #
 # Dll: Linker file - creates the parameter file passed on to the linker.
-#
-!ifndef NO_LNKFILE_RULE
-$(OBJDIR)\$(TARGET).lrf: $(MAKEFILE) $(ODIN32_INCLUDE)\odin32.post.emx.mk
-    @echo emx
-    @echo Creating file <<$@
-$(OBJ_PROFILE) 
-$(OBJS)
--o $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
-$(LIB_PROFILE)
-$(LIBS)
-$(OBJDIR)\bldlevel.$(ORGDEFFILE)
-<<keep
-!endif
-
-
-!else # !ifndef EXETARGET
-###############################################################################
-# EXE Target
-###############################################################################
-
-#
-# Exe: All rule - build objs, target exe, copies target to bin.
-#
-!ifndef NO_ALL_RULE
-all:    $(OBJDIR) \
-        $(INTLIBS) \
-        $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION) \
-        $(OBJDIR)\$(TARGET).sym \
-        $(ODIN32_BIN)\$(TARGET).$(TARGET_EXTENSION) \
-        $(ODIN32_BIN)\$(TARGET).sym \
-        $(ADDITIONAL_ALL)
-!endif
-
-
-#
-# Exe: Lib rule - dummy rule
-#
-!ifndef NO_LIB_RULE
-lib:
-!endif
-
-
-#
-# Exe: Main target rule - builds the target exe.
-#
-!ifndef NO_MAIN_RULE
-$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(LIBS) $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\bldlevel.$(ORGDEFFILE) $(OBJDIR)\$(TARGET).lrf
-    $(CMDQD_WAIT)
-    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
-!ifdef OS2RES
-    $(OS2RC) $(OS2RCLFLAGS) $(OS2RES) $@
-!endif
-!if !defined(DEBUG) && !defined(NO_LXLITE)
-# remove all EAs from the file to prevent errors running LXLITE on
-# a LAN server mounted JFS volume
-    eautil $@ nul /s
-    $(LXLITE) $@
-!endif
-!endif
-
-
-#
-# Exe: Linker file - creates the parameter file passed on to the linker.
 #
 !ifndef NO_LNKFILE_RULE
@@ -228 +168 @@
 !else
     @echo Creating file <<$@
-$(EMX)\lib\crt0.obj+$(OBJ_PROFILE)$(OBJS: =+^
-),
-$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION),
-$(OBJDIR)\$(TARGET).map,
-$(LIB_PROFILE)+$(LIBS: =+^
-)+$(EMX)\lib\end.lib,
-$(OBJDIR)\bldlevel.$(ORGDEFFILE);
+-o
+$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
+-Zmap
+$(OBJDIR)\bldlevel.$(ORGDEFFILE)
 <<keep
+!endif
+!ifdef OBJ_PROFILE
+    @echo $(OBJ_PROFILE)>> $@
+!endif
+!ifdef OBJS
+    @for %%i in ($(OBJS)) do @echo %%i>> $@
+!endif
+!ifdef LIB_PROFILE
+    @echo $(LIB_PROFILE)>> $@
+!endif
+!ifdef LIBS
+    @for %%i in ($(LIBS)) do @echo %%i>> $@
+!endif
+!endif
+
+
+!else # !ifndef EXETARGET
+###############################################################################
+# EXE Target
+###############################################################################
+
+#
+# Exe: All rule - build objs, target exe, copies target to bin.
+#
+!ifndef NO_ALL_RULE
+all:    $(OBJDIR) \
+        $(INTLIBS) \
+        $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION) \
+        $(OBJDIR)\$(TARGET).sym \
+        $(ODIN32_BIN)\$(TARGET).$(TARGET_EXTENSION) \
+        $(ODIN32_BIN)\$(TARGET).sym \
+        $(ADDITIONAL_ALL)
+!endif
+
+
+#
+# Exe: Lib rule - dummy rule
+#
+!ifndef NO_LIB_RULE
+lib:
+!endif
+
+
+#
+# Exe: Main target rule - builds the target exe.
+#
+!ifndef NO_MAIN_RULE
+$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(LIBS) $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\bldlevel.$(ORGDEFFILE) $(OBJDIR)\$(TARGET).lrf
+    $(CMDQD_WAIT)
+    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
+!ifdef OS2RES
+    $(OS2RC) $(OS2RCLFLAGS) $(OS2RES) $@
+!endif
+!if !defined(DEBUG) && !defined(NO_LXLITE)
+# remove all EAs from the file to prevent errors running LXLITE on
+# a LAN server mounted JFS volume
+    eautil $@ nul /s
+    $(LXLITE) $@
+!endif
+!endif
+
+
+#
+# Exe: Linker file - creates the parameter file passed on to the linker.
+#
+!ifndef NO_LNKFILE_RULE
+$(OBJDIR)\$(TARGET).lrf: $(MAKEFILE) $(ODIN32_INCLUDE)\odin32.post.emx.mk
+!if "$(CCENV)" != "EMX"
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS:  =^
+)
+$(OBJ_PROFILE) $(LIB_PROFILE)
+$(LIBS:  =^
+)
+$(OBJDIR)\bldlevel.$(ORGDEFFILE)
+<<keep
+!else
+    @echo Creating file <<$@
+-o
+$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
+-Zmap
+$(OBJDIR)\bldlevel.$(ORGDEFFILE)
+<<keep
+!ifdef OBJ_PROFILE
+    @echo $(OBJ_PROFILE)>> $@
+!endif
+!ifdef OBJS
+    @for %%i in ($(OBJS)) do @echo %%i>> $@
+!endif
+!ifdef LIB_PROFILE
+    @echo $(LIB_PROFILE)>> $@
+!endif
+!ifdef LIBS
+    @for %%i in ($(LIBS)) do @echo %%i>> $@
 !endif
 !endif