diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-04-15 13:36:58 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-04-15 14:08:09 +0300 |
| commit | 20ba3c4ae8053079bc5ec134c4c60a3aa33b5ad7 (patch) | |
| tree | 11bda8adc750e2bc15f377512d34e8215f507881 /solenv/inc/settings.mk | |
| parent | 1b7717c24244aafbb314dcf4fca2efc901fd1393 (diff) | |
Kill OS/2 stuff
Diffstat (limited to 'solenv/inc/settings.mk')
| -rw-r--r-- | solenv/inc/settings.mk | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 1bfe7fd49972..a694295baf1c 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -571,7 +571,7 @@ ROUT=$(OUTPATH).tlk .ENDIF .IF "$(PRJ)"!="." -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" PATH_IN_MODULE:=\ $(subst,$(normpath $(shell @+cd $(PRJ) && pwd $(PWDFLAGS)))/, $(PWD)) .ELSE # "$(GUI)"=="WNT" @@ -698,7 +698,7 @@ PROCESSOUT*:=$(MISC) # Makros fuer die Librarynamen des Solar .INCLUDE : libs.mk -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" VERSIONOBJ=$(SLO)/_version.obj .ENDIF @@ -706,11 +706,11 @@ VERSIONOBJ=$(SLO)/_version.obj VERSIONOBJ=$(SLO)/_version.o .ENDIF -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" WINVERSIONNAMES=$(UNIXVERSIONNAMES) .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" SHELLLIB=-lgdi32 -lshell32 -ladvapi32 -lcomdlg32 .ELSE @@ -875,10 +875,6 @@ SCPDEFS+=-DCCNUMVER=$(CCNUMVER) .IF "$(COM)"=="GCC" SCPDEFS+=-DSHORTSTDCPP3=$(SHORTSTDCPP3) -DSHORTSTDC3=$(SHORTSTDC3) .ENDIF # "$(SHORTSTDCPP3)"!="" -# extend library path for OS/2 gcc/wlink -.IF "$(GUI)"=="OS2" -LIB:=$(LB);$(SLB);$(ILIB) -.ENDIF UNOIDLDEFS+=-DSUPD=$(UPD) -DUPD=$(UPD) @@ -889,7 +885,7 @@ UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc -I CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CPUNAME) -.IF "$(USE_DEBUG_RUNTIME)" != "" && "$(GUI)"!="OS2" +.IF "$(USE_DEBUG_RUNTIME)" != "" CDEFS+=-D_DEBUG_RUNTIME .ENDIF @@ -1016,10 +1012,6 @@ LNTFLAGSOUTOBJ=-os .INCLUDE : unx.mk .ENDIF -.IF "$(GUI)" == "OS2" -.INCLUDE : os2.mk -.ENDIF - .IF "$(OOO_LIBRARY_PATH_VAR)" != "" # Add SOLARLIBDIR at the begin of a (potentially previously undefined) library # path (LD_LIBRARY_PATH, PATH, etc.; prepending avoids fetching libraries from |