From bb5bdbbdca966c03e6b22b455630381154cb6d01 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Fri, 16 Sep 2011 16:25:27 +0200 Subject: Revert "Trying to chop out the uwinapi library" This reverts commit 2dea0dab4fafda3c10a5bd03ad15ed39a4658b51. --- soltools/cpp/makefile.mk | 1 + soltools/javadep/makefile.mk | 1 + soltools/ldump/makefile.mk | 1 + soltools/mkdepend/makefile.mk | 1 + soltools/testSHL/makefile.mk | 1 + 5 files changed, 5 insertions(+) (limited to 'soltools') diff --git a/soltools/cpp/makefile.mk b/soltools/cpp/makefile.mk index b482e490c2a2..5cada33f9cd4 100644 --- a/soltools/cpp/makefile.mk +++ b/soltools/cpp/makefile.mk @@ -42,6 +42,7 @@ all: @echo Nothing done when cross-compiling .ENDIF +UWINAPILIB=$(0) LIBSALCPPRT=$(0) # --- Files -------------------------------------------------------- diff --git a/soltools/javadep/makefile.mk b/soltools/javadep/makefile.mk index 4c9c8b3e9b8e..e6dcf32350f2 100644 --- a/soltools/javadep/makefile.mk +++ b/soltools/javadep/makefile.mk @@ -42,6 +42,7 @@ all: @echo Nothing done when cross-compiling .ENDIF +UWINAPILIB=$(0) LIBSALCPPRT=$(0) # --- Files -------------------------------------------------------- diff --git a/soltools/ldump/makefile.mk b/soltools/ldump/makefile.mk index 06f4955f376b..6d0eda3bf99e 100644 --- a/soltools/ldump/makefile.mk +++ b/soltools/ldump/makefile.mk @@ -36,6 +36,7 @@ TARGETTYPE=CUI .INCLUDE : $(PRJ)$/util$/makefile.pmk .INCLUDE : settings.mk +UWINAPILIB=$(0) LIBSALCPPRT=$(0) # --- Files -------------------------------------------------------- diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk index fc437aeb219a..9c700ff6754e 100644 --- a/soltools/mkdepend/makefile.mk +++ b/soltools/mkdepend/makefile.mk @@ -44,6 +44,7 @@ all: .ENDIF LIBSALCPPRT= +UWINAPILIB= CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS diff --git a/soltools/testSHL/makefile.mk b/soltools/testSHL/makefile.mk index 7b7c0354b093..0377137b2274 100644 --- a/soltools/testSHL/makefile.mk +++ b/soltools/testSHL/makefile.mk @@ -35,6 +35,7 @@ TARGETTYPE=CUI .INCLUDE : $(PRJ)$/util$/makefile.pmk .INCLUDE : settings.mk +UWINAPILIB=$(0) LIBSALCPPRT=$(0) # ------------------------------------------------------------------ -- cgit