strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CWS gnumake3: templates use gb_STDLIBS

Browse source
This commit is contained in:
Mathias Bauer 2011-02-03 09:42:40 +01:00
parent 67f62cc989
commit 4bf21df8c3
3 changed files with 5 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
solenv/gbuild/templates/CppunitTest.mk
View file

@ -31,6 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,MODULE_NAME, \
)) ))
$(eval $(call gb_CppunitTest_add_linked_libs,MODULE_NAME, \ $(eval $(call gb_CppunitTest_add_linked_libs,MODULE_NAME, \
$(gb_STDLIBS) \
)) ))
$(eval $(call gb_CppunitTest_set_include,MODULE_NAME,\ $(eval $(call gb_CppunitTest_set_include,MODULE_NAME,\

18
solenv/gbuild/templates/Executable.mk
View file

@ -36,26 +36,10 @@ $(eval $(call gb_Executable_set_cxxflags,EXEC,\
)) ))
$(eval $(call gb_Executable_add_linked_libs,EXEC,\ $(eval $(call gb_Executable_add_linked_libs,EXEC,\
$(gb_STDLIBS) \
)) ))
$(eval $(call gb_Executable_add_exception_objects,EXEC,\ $(eval $(call gb_Executable_add_exception_objects,EXEC,\
)) ))
ifeq ($(OS),WNT)
$(eval $(call gb_Executable_add_linked_libs,mkunroll,\
kernel32 \
msvcrt \
oldnames \
user32 \
uwinapi \
))
endif
ifeq ($(OS),LINUX)
$(eval $(call gb_Executable_add_linked_libs,mkunroll,\
dl \
pthread \
))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

24
solenv/gbuild/templates/Library.mk
View file

@ -56,26 +56,9 @@ $(eval $(call gb_Library_set_defs,LIB,\
# add libraries to be linked to LIB; again these names need to be given as # add libraries to be linked to LIB; again these names need to be given as
# specified in Repository.mk # specified in Repository.mk
$(eval $(call gb_Library_add_linked_libs,LIB,\ $(eval $(call gb_Library_add_linked_libs,LIB,\
$(gb_STDLIBS) \
)) ))
# this code usually will be platform specific; these libraries are also defined in Repository.mk
ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_linked_libs,LIB,\
dl \
m \
pthread \
))
endif
ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_linked_libs,LIB,\
kernel32 \
msvcrt \
oldnames \
user32 \
))
endif
# add all source files that shall be compiled with exceptions enabled # add all source files that shall be compiled with exceptions enabled
# the name is relative to $(SRCROOT) and must not contain an extension # the name is relative to $(SRCROOT) and must not contain an extension
$(eval $(call gb_Library_add_exception_objects,LIB,\ $(eval $(call gb_Library_add_exception_objects,LIB,\
@ -91,14 +74,13 @@ $(eval $(call gb_SdiTarget_set_include,MODULE/sdi/ROOT_SDI_FILE,\
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
# this is an example how files can be added that require special compiler settings # this is an example how files can be added that require special compiler settings, e.g. building without optimizing
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_cxxobjects,LIB,\ $(eval $(call gb_Library_add_cxxobjects,LIB,\
MODULE/source/foo/bar \ MODULE/source/foo/bar \
, $(gb_LinkTarget_EXCEPTIONFLAGS) -nologo -UPRECOMPILED_HEADERS \ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
)) ))
endif endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4: