Kaydet (Commit) 6465f4e8 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Rehash cross-compilation ideas

Drop the TARGETPLATFORM=BUILD indication of stuff that is to be built
for the build platform but pointless to build for the host platform. I
will handle the split of stuff built for the build or host platforms
differently. Note that some libraries need to be built for both
platforms.

Add explicit rules to do nothing for the cross-compilation case, but
likely even that will be unnecessary in the case of complete modules
like soltools (?). I will just mark modules that are for the build
platform only with an own flag in BUILD_TYPE.
üst 5edd3ce9
...@@ -30,7 +30,6 @@ PRJ=.. ...@@ -30,7 +30,6 @@ PRJ=..
PRJNAME=soltools PRJNAME=soltools
TARGET=adjustvisibility TARGET=adjustvisibility
TARGETTYPE=CUI TARGETTYPE=CUI
TARGETPLATFORM=BUILD
ENABLE_EXCEPTIONS=TRUE ENABLE_EXCEPTIONS=TRUE
noadjust=TRUE noadjust=TRUE
......
...@@ -30,7 +30,6 @@ PRJ=.. ...@@ -30,7 +30,6 @@ PRJ=..
PRJNAME=soltools PRJNAME=soltools
TARGET=cpp TARGET=cpp
TARGETTYPE=CUI TARGETTYPE=CUI
TARGETPLATFORM=BUILD
NO_DEFAULT_STL=TRUE NO_DEFAULT_STL=TRUE
# --- Settings ----------------------------------------------------- # --- Settings -----------------------------------------------------
...@@ -38,6 +37,11 @@ NO_DEFAULT_STL=TRUE ...@@ -38,6 +37,11 @@ NO_DEFAULT_STL=TRUE
.INCLUDE : $(PRJ)$/util$/makefile.pmk .INCLUDE : $(PRJ)$/util$/makefile.pmk
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(CROSS_COMPILING)"=="YES"
all:
@echo Nothing done when cross-compiling
.ENDIF
UWINAPILIB=$(0) UWINAPILIB=$(0)
LIBSALCPPRT=$(0) LIBSALCPPRT=$(0)
......
...@@ -30,7 +30,6 @@ PRJ=.. ...@@ -30,7 +30,6 @@ PRJ=..
PRJNAME=soltools PRJNAME=soltools
TARGET=soltools_giparser TARGET=soltools_giparser
TARGETTYPE=CUI TARGETTYPE=CUI
TARGETPLATFORM=BUILD
ENABLE_EXCEPTIONS=TRUE ENABLE_EXCEPTIONS=TRUE
# --- Settings ----------------------------------------------------- # --- Settings -----------------------------------------------------
...@@ -38,6 +37,11 @@ ENABLE_EXCEPTIONS=TRUE ...@@ -38,6 +37,11 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : $(PRJ)$/util$/makefile.pmk .INCLUDE : $(PRJ)$/util$/makefile.pmk
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(CROSS_COMPILING)"=="YES"
all:
@echo Nothing done when cross-compiling
.ENDIF
# --- Files -------------------------------------------------------- # --- Files --------------------------------------------------------
OBJFILES=\ OBJFILES=\
......
...@@ -30,7 +30,6 @@ PRJ=.. ...@@ -30,7 +30,6 @@ PRJ=..
PRJNAME=soltools PRJNAME=soltools
TARGET=javadep TARGET=javadep
TARGETTYPE=CUI TARGETTYPE=CUI
TARGETPLATFORM=BUILD
NO_DEFAULT_STL=TRUE NO_DEFAULT_STL=TRUE
# --- Settings ----------------------------------------------------- # --- Settings -----------------------------------------------------
...@@ -38,6 +37,11 @@ NO_DEFAULT_STL=TRUE ...@@ -38,6 +37,11 @@ NO_DEFAULT_STL=TRUE
.INCLUDE : $(PRJ)$/util$/makefile.pmk .INCLUDE : $(PRJ)$/util$/makefile.pmk
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(CROSS_COMPILING)"=="YES"
all:
@echo Nothing done when cross-compiling
.ENDIF
UWINAPILIB=$(0) UWINAPILIB=$(0)
LIBSALCPPRT=$(0) LIBSALCPPRT=$(0)
......
...@@ -29,7 +29,6 @@ PRJNAME=soltools ...@@ -29,7 +29,6 @@ PRJNAME=soltools
TARGET=make_makedepend TARGET=make_makedepend
PRJ=.. PRJ=..
TARGETTYPE=CUI TARGETTYPE=CUI
TARGETPLATFORM=BUILD
LIBTARGET=NO LIBTARGET=NO
# noadjust here to have dependencies over there # noadjust here to have dependencies over there
noadjust=TRUE noadjust=TRUE
...@@ -44,6 +43,11 @@ EXTERNAL_WARNINGS_NOT_ERRORS=TRUE ...@@ -44,6 +43,11 @@ EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
.INCLUDE : $(PRJ)$/util$/makefile.pmk .INCLUDE : $(PRJ)$/util$/makefile.pmk
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(CROSS_COMPILING)"=="YES"
all:
@echo Nothing done when cross-compiling
.ENDIF
LIBSALCPPRT= LIBSALCPPRT=
UWINAPILIB= UWINAPILIB=
......
...@@ -30,14 +30,16 @@ PRJ=.. ...@@ -30,14 +30,16 @@ PRJ=..
PRJNAME=soltools PRJNAME=soltools
TARGET=soltools_support TARGET=soltools_support
TARGETTYPE=CUI TARGETTYPE=CUI
TARGETPLATFORM=BUILD
# --- Settings ----------------------------------------------------- # --- Settings -----------------------------------------------------
.INCLUDE : $(PRJ)$/util$/makefile.pmk .INCLUDE : $(PRJ)$/util$/makefile.pmk
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(CROSS_COMPILING)"=="YES"
all:
@echo Nothing done when cross-compiling
.ENDIF
# --- Files -------------------------------------------------------- # --- Files --------------------------------------------------------
......
...@@ -36,6 +36,11 @@ CAPTURE_OUTPUT = > $(MISC)$/testhxx.output && $(TOUCH) $(SLO)$/testhxx.obj ...@@ -36,6 +36,11 @@ CAPTURE_OUTPUT = > $(MISC)$/testhxx.output && $(TOUCH) $(SLO)$/testhxx.obj
.INCLUDE: $(PRJ)$/util$/makefile.pmk .INCLUDE: $(PRJ)$/util$/makefile.pmk
.INCLUDE: settings.mk .INCLUDE: settings.mk
.IF "$(CROSS_COMPILING)"=="YES"
all:
@echo Nothing done when cross-compiling
.ENDIF
SLOFILES = $(SLO)$/testhxx.obj SLOFILES = $(SLO)$/testhxx.obj
.INCLUDE: target.mk .INCLUDE: target.mk
......
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