diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-02-19 15:51:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-02-19 15:51:34 +0000 |
| commit | 998e2a64971516a2a77d34c1246a98e859a3e223 (patch) | |
| tree | 173f0fb50c2e62cd1e06bc21aee00158302ee4d0 /svx/Executable_gengal.bin.mk | |
| parent | 96cb767123c9e8f5db197454b4da02c8f7583d2b (diff) | |
fix windows build, gengal.bin should be gengal.exe there according to scp2
Diffstat (limited to 'svx/Executable_gengal.bin.mk')
| -rw-r--r-- | svx/Executable_gengal.bin.mk | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk index 36f77520a133..3143e5f4f4ce 100644 --- a/svx/Executable_gengal.bin.mk +++ b/svx/Executable_gengal.bin.mk @@ -25,9 +25,16 @@ # #************************************************************************* -$(eval $(call gb_Executable_Executable,gengal.bin)) +ifeq ($(OS),WNT) +gengalbin := gengal +else +gengalbin := gengal.bin +endif + + +$(eval $(call gb_Executable_Executable,$(gengalbin))) -$(eval $(call gb_Executable_set_include,gengal.bin,\ +$(eval $(call gb_Executable_set_include,$(gengalbin),\ $$(INCLUDE) \ -I$(SRCDIR)/svx/inc/ \ -I$(SRCDIR)/svx/inc/pch \ @@ -36,11 +43,11 @@ $(eval $(call gb_Executable_set_include,gengal.bin,\ -I$(OUTDIR)/inc/offapi \ )) -$(eval $(call gb_Executable_add_cxxflags,gengal.bin,\ +$(eval $(call gb_Executable_add_cxxflags,$(gengalbin),\ $$(CXXFLAGS) \ )) -$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\ +$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\ sal \ tl \ svl \ @@ -52,16 +59,16 @@ $(eval $(call gb_Executable_add_linked_libs,gengal.bin,\ svxcore \ )) -$(eval $(call gb_Executable_add_exception_objects,gengal.bin,\ +$(eval $(call gb_Executable_add_exception_objects,$(gengalbin),\ svx/source/gengal/gengal \ )) -$(eval $(call gb_Executable_add_linked_static_libs,gengal.bin,\ +$(eval $(call gb_Executable_add_linked_static_libs,$(gengalbin),\ vclmain \ )) ifeq ($(OS),WNT) -$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\ +$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\ kernel32 \ msvcrt \ oldnames \ @@ -71,7 +78,7 @@ $(eval $(call gb_Executable_add_linked_libs,gengal.bin,\ endif ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\ +$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\ dl \ pthread \ )) |