openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1842965 - in /openoffice/trunk/main/solenv/gbuild: Library.mk LinkTarget.mk platform/freebsd.mk platform/linux.mk platform/macosx.mk platform/os2.mk platform/solaris.mk platform/windows.mk platform/winmingw.mk
Date Fri, 05 Oct 2018 18:50:41 GMT
Author: damjan
Date: Fri Oct  5 18:50:40 2018
New Revision: 1842965

URL: http://svn.apache.org/viewvc?rev=1842965&view=rev
Log:
Complete enough of the assembly language building for now,
to successfully build main/basic on Windows.

Patch by: me


Modified:
    openoffice/trunk/main/solenv/gbuild/Library.mk
    openoffice/trunk/main/solenv/gbuild/LinkTarget.mk
    openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk
    openoffice/trunk/main/solenv/gbuild/platform/linux.mk
    openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
    openoffice/trunk/main/solenv/gbuild/platform/os2.mk
    openoffice/trunk/main/solenv/gbuild/platform/solaris.mk
    openoffice/trunk/main/solenv/gbuild/platform/windows.mk
    openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk

Modified: openoffice/trunk/main/solenv/gbuild/Library.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/Library.mk?rev=1842965&r1=1842964&r2=1842965&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/Library.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/Library.mk Fri Oct  5 18:50:40 2018
@@ -107,6 +107,8 @@ $(or \
 endef
 
 $(eval $(foreach method,\
+	add_asmobject \
+	add_asmobjects \
 	add_cobject \
 	add_cobjects \
 	add_cxxobject \

Modified: openoffice/trunk/main/solenv/gbuild/LinkTarget.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/LinkTarget.mk?rev=1842965&r1=1842964&r2=1842965&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/LinkTarget.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/LinkTarget.mk Fri Oct  5 18:50:40 2018
@@ -70,7 +70,7 @@ gb_AsmObject_get_source = $(1)/$(2)$(gb_
 
 define gb_AsmObject__rules
 $$(call gb_AsmObject_get_target,%) : $$(call gb_AsmObject_get_source,$(1),%)
-	$$(call gb_AsmObject__command,$$@,$$*,$$<))
+	$$(call gb_AsmObject__command,$$@,$$*,$$<)
 
 endef
 

Modified: openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk?rev=1842965&r1=1842964&r2=1842965&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk Fri Oct  5 18:50:40 2018
@@ -290,6 +290,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(if $(call gb_Library_is_udk_versioned,$(1)),-Wl$(COMMA)-h$(notdir $(1)).$(gb_UDK_MAJOR))
\
 		$(subst \d,$$,$(RPATH)) \
 		$(T_LDFLAGS) \
+		$(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \
 		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
 		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \

Modified: openoffice/trunk/main/solenv/gbuild/platform/linux.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/linux.mk?rev=1842965&r1=1842964&r2=1842965&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/linux.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/linux.mk Fri Oct  5 18:50:40 2018
@@ -266,6 +266,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(if $(call gb_Library_is_udk_versioned,$(1)),-Wl$(COMMA)-h$(notdir $(1)).$(gb_UDK_MAJOR))
\
 		$(subst \d,$$,$(RPATH)) \
 		$(T_LDFLAGS) \
+		$(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \
 		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
 		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \

Modified: openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/macosx.mk?rev=1842965&r1=1842964&r2=1842965&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/macosx.mk Fri Oct  5 18:50:40 2018
@@ -307,6 +307,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(subst \d,$$,$(RPATH)) \
 		$(T_LDFLAGS) $(gb_macos_LDFLAGS) \
 		$(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \
+		$(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \
 		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
 		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \

Modified: openoffice/trunk/main/solenv/gbuild/platform/os2.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/os2.mk?rev=1842965&r1=1842964&r2=1842965&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/os2.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/os2.mk Fri Oct  5 18:50:40 2018
@@ -331,9 +331,11 @@ $(call gb_Helper_abbreviate_dirs_native,
 	$(if $(DLLTARGET), echo LIBRARY	$(DLLBASE) INITINSTANCE TERMINSTANCE > $(DLLDEF) &&)
\
 	$(if $(DLLTARGET), echo DATA MULTIPLE >> $(DLLDEF) &&) \
 	RESPONSEFILE=$(call var2filecr,$(shell $(gb_MKTEMP)),1, \
-	    $(call gb_Helper_convert_native,$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object)))
\
+	    $(call gb_Helper_convert_native,\
+		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
 		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+		$(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \
 		$(PCHOBJS))) && \
 	$(if $(DLLTARGET), echo EXPORTS >> $(DLLDEF) &&) \
 	$(if $(DLLTARGET), emxexp @$${RESPONSEFILE} | fix_exp_file | sort | uniq | fix_def_ord >>
$(DLLDEF) &&) \

Modified: openoffice/trunk/main/solenv/gbuild/platform/solaris.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/solaris.mk?rev=1842965&r1=1842964&r2=1842965&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/solaris.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/solaris.mk Fri Oct  5 18:50:40 2018
@@ -232,6 +232,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(if $(call gb_Library_is_udk_versioned,$(1)),-Wl$(COMMA)-h$(notdir $(1)).$(gb_UDK_MAJOR))
\
 		$(subst \d,$$,$(RPATH)) \
 		$(T_LDFLAGS) \
+		$(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \
 		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
 		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \

Modified: openoffice/trunk/main/solenv/gbuild/platform/windows.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/windows.mk?rev=1842965&r1=1842964&r2=1842965&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/windows.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/windows.mk Fri Oct  5 18:50:40 2018
@@ -28,6 +28,7 @@ COM := MSC
 gb_TMPDIR:=$(if $(TMPDIR),$(shell cygpath -m $(TMPDIR)),$(shell cygpath -m /tmp))
 gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX
 
+gb_AS := ml
 gb_CC := cl
 gb_CXX := cl
 gb_LINK := link
@@ -36,6 +37,9 @@ gb_CLASSPATHSEP := ;
 gb_RC := rc
 
 # use CC/CXX if they are nondefaults
+ifneq ($(origin AS),default)
+gb_AS := $(AS)
+endif
 ifneq ($(origin CC),default)
 gb_CC := $(CC)
 gb_GCCP := $(CC)
@@ -272,15 +276,13 @@ $(call gb_Output_announce,$(2),$(true),A
 $(call gb_Helper_abbreviate_dirs_native,\
 	mkdir -p $(dir $(1)) && \
 	unset INCLUDE && \
-	$(gb_CC) \
+	$(gb_AS) \
 		$(DEFS) \
-		$(T_CFLAGS) \
-		-FD$(PDBFILE) \
-		$(CFLAGS) \
-		-I$(dir $(3)) \
-		$(INCLUDE) \
-		-c $(3) \
-		-Fo$(1))
+		-safeseh \
+		-Cp \
+		-coff \
+		-Fo$(1) \
+		-c $(3))
 endef
 
 # CObject class
@@ -449,7 +451,9 @@ $(call gb_Helper_abbreviate_dirs_native,
 	mkdir -p $(dir $(1)) && \
 	rm -f $(1) && \
 	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100, \
-	    $(call gb_Helper_convert_native,$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object)))
\
+	    $(call gb_Helper_convert_native,\
+		$(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \
+		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
 		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
 		$(PCHOBJS) $(NATIVERES))) && \

Modified: openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk?rev=1842965&r1=1842964&r2=1842965&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk Fri Oct  5 18:50:40 2018
@@ -424,7 +424,9 @@ $(call gb_Helper_abbreviate_dirs_native,
 	mkdir -p $(dir $(1)) && \
 	rm -f $(1) && \
 	RESPONSEFILE=`$(gb_MKTEMP)` && \
-	echo "$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+	echo "\
+		$(foreach object,$(ASMXXOBJECTS),$(call gb_AsmObject_get_target,$(object))) \
+		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
 		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
 		$(NATIVERES) " > $${RESPONSEFILE} && \



Mime
View raw message