diff options
| author | David Tardon <dtardon@redhat.com> | 2014-02-09 21:19:07 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-02-09 21:19:07 +0100 |
| commit | 864f775189c23053bfa6ce8fb051dbc0d71929d9 (patch) | |
| tree | f83f0100be54ebacefddffc1ad06ec7910e5de94 /RepositoryExternal.mk | |
| parent | coverity#1169804 Unchecked return value (diff) | |
| download | core-864f775189c23053bfa6ce8fb051dbc0d71929d9.tar.gz core-864f775189c23053bfa6ce8fb051dbc0d71929d9.zip | |
move glew to libs section
Change-Id: I1e6a4b025b945fc725738303c499c0ea44f9c8a6
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 0c48bf256908..d0cb1fb3fad5 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -126,40 +126,6 @@ endef endif -ifeq ($(SYSTEM_GLEW),YES) - -define gb_LinkTarget__use_glew -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(GLEW_CFLAGS) \ -) -$(call gb_LinkTarget_add_libs,$(1),$(GLEW_LIBS)) - -endef - -else - -define gb_LinkTarget__use_glew -$(call gb_LinkTarget_use_external_project,$(1),glew) -$(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,glew/include) \ - $$(INCLUDE) \ -) - -ifeq ($(COM),MSC) -$(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,glew)/lib/$(if $(MSVC_USE_DEBUG_RUNTIME),Debug/Win32/glew32d.lib,Release/Win32/glew32.lib) \ -) -else -$(call gb_LinkTarget_add_libs,$(1),\ - -L$(call gb_UnpackedTarball_get_dir,glew)/lib/ -lGLEW \ -) -endif - -endef - -endif - ifeq ($(SYSTEM_GLM),YES) gb_LinkTarget__use_glm_headers := @@ -249,6 +215,40 @@ endef endif +ifeq ($(SYSTEM_GLEW),YES) + +define gb_LinkTarget__use_glew +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(GLEW_CFLAGS) \ +) +$(call gb_LinkTarget_add_libs,$(1),$(GLEW_LIBS)) + +endef + +else + +define gb_LinkTarget__use_glew +$(call gb_LinkTarget_use_external_project,$(1),glew) +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,glew/include) \ + $$(INCLUDE) \ +) + +ifeq ($(COM),MSC) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,glew)/lib/$(if $(MSVC_USE_DEBUG_RUNTIME),Debug/Win32/glew32d.lib,Release/Win32/glew32.lib) \ +) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,glew)/lib/ -lGLEW \ +) +endif + +endef + +endif + define gb_LinkTarget__use_iconv $(call gb_LinkTarget_add_libs,$(1),-liconv) |