settings.mk (78ecfec3) settings.mk (386ca866)
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 864 unchanged lines hidden (view full) ---

873
874
875UNOIDLDEFS+=-DSUPD=$(UPD) -DUPD=$(UPD)
876
877UNOIDLDEPFLAGS=-Mdepend=$(SOLARVER)
878
879UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc -I$(SOLARIDLDIR) -I$(SOLARINCDIR)
880
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 864 unchanged lines hidden (view full) ---

873
874
875UNOIDLDEFS+=-DSUPD=$(UPD) -DUPD=$(UPD)
876
877UNOIDLDEPFLAGS=-Mdepend=$(SOLARVER)
878
879UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc -I$(SOLARIDLDIR) -I$(SOLARINCDIR)
880
881CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -D$(CPUNAME)
881CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -D$(CPUNAME) -DCPPU_ENV=$(COMNAME)
882
883.IF "$(USE_STLP_DEBUG)" != "" && "$(GUI)"!="OS2"
884CDEFS+=-D_STLP_DEBUG
885.ENDIF
886
887.IF "$(CDEFS_PRESET)" != ""
888CDEFS+=$(CDEFS_PRESET)
889.ENDIF

--- 173 unchanged lines hidden (view full) ---

1063
1064# Define SCPCOMP without wrapper because pre2par.pl chokes on DOS style
1065# paths. (See iz57443)
1066SCPCOMP=$(PERL) $(SOLARENV)/bin/pre2par.pl
1067SCPLINK=$(PERL) $(SOLARENV)/bin/par2script.pl
1068LZIP*=lzip
1069CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpplcc
1070
882
883.IF "$(USE_STLP_DEBUG)" != "" && "$(GUI)"!="OS2"
884CDEFS+=-D_STLP_DEBUG
885.ENDIF
886
887.IF "$(CDEFS_PRESET)" != ""
888CDEFS+=$(CDEFS_PRESET)
889.ENDIF

--- 173 unchanged lines hidden (view full) ---

1063
1064# Define SCPCOMP without wrapper because pre2par.pl chokes on DOS style
1065# paths. (See iz57443)
1066SCPCOMP=$(PERL) $(SOLARENV)/bin/pre2par.pl
1067SCPLINK=$(PERL) $(SOLARENV)/bin/par2script.pl
1068LZIP*=lzip
1069CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpplcc
1070
1071.IF "$(DISABLE_ENHANCED_COMID)"==""
1072.INCLUDE : tg_compv.mk
1073.ELSE # "$(DISABLE_ENHANCED_COMID)"==""
1074COMID=$(COM)
1075.ENDIF # "$(DISABLE_ENHANCED_COMID)"==""
1076.IF "$(SOLAR_JAVA)"=="TRUE"
1077.IF "$(USE_JAVAVER)"!=""
1078.INCLUDE : tg_javav.mk
1079.ENDIF "$(USE_JAVAVER)"!=""
1080.ENDIF # "$(SOLAR_JAVA)"=="TRUE"
1081
1082# --- extend new environment ----------------------------------
1083CDEFS+= -DSUPD=$(UPD)

--- 280 unchanged lines hidden --- 		1071.IF "$(SOLAR_JAVA)"=="TRUE"
1072.IF "$(USE_JAVAVER)"!=""
1073.INCLUDE : tg_javav.mk
1074.ENDIF "$(USE_JAVAVER)"!=""
1075.ENDIF # "$(SOLAR_JAVA)"=="TRUE"
1076
1077# --- extend new environment ----------------------------------
1078CDEFS+= -DSUPD=$(UPD)

--- 280 unchanged lines hidden ---