diff options
author | David Tardon <dtardon@redhat.com> | 2011-09-26 12:47:35 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2011-09-26 12:47:35 +0200 |
commit | a44020dd9eb7f1607c05869fe5430a2ae68d46f2 (patch) | |
tree | edb0c0913a499fabf64cc7e347408130efc4074d /desktop | |
parent | 096397e9da806aef68812c40ddc02075c296ba72 (diff) |
add resource files
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/Executable_quickstart.mk | 2 | ||||
-rw-r--r-- | desktop/Executable_sbase.mk | 2 | ||||
-rw-r--r-- | desktop/Executable_scalc.mk | 2 | ||||
-rw-r--r-- | desktop/Executable_sdraw.mk | 2 | ||||
-rw-r--r-- | desktop/Executable_simpress.mk | 2 | ||||
-rw-r--r-- | desktop/Executable_smath.mk | 2 | ||||
-rw-r--r-- | desktop/Executable_soffice.mk | 2 | ||||
-rw-r--r-- | desktop/Executable_sweb.mk | 2 | ||||
-rw-r--r-- | desktop/Executable_swriter.mk | 2 | ||||
-rw-r--r-- | desktop/WinResTarget_quickstart.mk | 8 | ||||
-rw-r--r-- | desktop/WinResTarget_sbase.mk | 10 | ||||
-rw-r--r-- | desktop/WinResTarget_scalc.mk | 10 | ||||
-rw-r--r-- | desktop/WinResTarget_sdraw.mk | 10 | ||||
-rw-r--r-- | desktop/WinResTarget_simpress.mk | 10 | ||||
-rw-r--r-- | desktop/WinResTarget_smath.mk | 10 | ||||
-rw-r--r-- | desktop/WinResTarget_soffice.mk | 10 | ||||
-rw-r--r-- | desktop/WinResTarget_sweb.mk | 10 | ||||
-rw-r--r-- | desktop/WinResTarget_swriter.mk | 10 |
18 files changed, 62 insertions, 44 deletions
diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk index 6db687018132..593ef1f09d0b 100644 --- a/desktop/Executable_quickstart.mk +++ b/desktop/Executable_quickstart.mk @@ -60,4 +60,6 @@ $(eval $(call gb_Executable_add_exception_objects,quickstart,\ desktop/win32/source/QuickStart/QuickStart \ )) +$(eval $(call gb_Executable_add_nativeres,quickstart,src)) + # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index 5cd916b0816d..d5e0991862ad 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -43,4 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,sbase,\ desktop/win32/source/applauncher/sbase \ )) +$(eval $(call gb_Executable_add_nativeres,sbase,src)) + # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index e93aea2ee88e..550add6772b6 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -43,4 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,scalc,\ desktop/win32/source/applauncher/scalc \ )) +$(eval $(call gb_Executable_add_nativeres,scalc,src)) + # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index dc13c41ebfa3..29fb38706216 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -43,4 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,sdraw,\ desktop/win32/source/applauncher/sdraw \ )) +$(eval $(call gb_Executable_add_nativeres,sdraw,src)) + # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index 728d8e3d20b0..281718c2e65b 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -43,4 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,simpress,\ desktop/win32/source/applauncher/simpress \ )) +$(eval $(call gb_Executable_add_nativeres,simpress,src)) + # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index b7c9307a565d..e8de1007d910 100644 --- a/desktop/Executable_smath.mk +++ b/desktop/Executable_smath.mk @@ -43,4 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,smath,\ desktop/win32/source/applauncher/smath \ )) +$(eval $(call gb_Executable_add_nativeres,smath,src)) + # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index 8240ef30d38e..cf142d6ea97b 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -50,4 +50,6 @@ $(eval $(call gb_Executable_add_noexception_objects,soffice,\ desktop/win32/source/officeloader/officeloader \ )) +$(eval $(call gb_Executable_add_nativeres,soffice,src)) + # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk index 14e9296f1754..67daa625a566 100644 --- a/desktop/Executable_sweb.mk +++ b/desktop/Executable_sweb.mk @@ -43,4 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,sweb,\ desktop/win32/source/applauncher/sweb \ )) +$(eval $(call gb_Executable_add_nativeres,sweb,src)) + # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk index 30e98b14cb90..d38ea6ef6583 100644 --- a/desktop/Executable_swriter.mk +++ b/desktop/Executable_swriter.mk @@ -43,4 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,swriter,\ desktop/win32/source/applauncher/swriter \ )) +$(eval $(call gb_Executable_add_nativeres,swriter,src)) + # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_quickstart.mk b/desktop/WinResTarget_quickstart.mk index cf518aa0a765..9c3ec145289f 100644 --- a/desktop/WinResTarget_quickstart.mk +++ b/desktop/WinResTarget_quickstart.mk @@ -23,18 +23,18 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_WinResTarget_WinResTarget,quickstart)) +$(eval $(call gb_WinResTarget_WinResTarget,quickstart/src)) -$(eval $(call gb_WinResTarget_set_include,quickstart,\ +$(eval $(call gb_WinResTarget_set_include,quickstart/src,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/win32/source/QuickStart \ -I$(SRCDIR)/sysui/desktop \ )) -$(eval $(call gb_WinResTarget_add_dependency,quickstart,\ +$(eval $(call gb_WinResTarget_add_dependency,quickstart/src,\ sysui/desktop/icons/ooo3_main_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,quickstart,desktop/win32/source/QuickStart/OOQuickStart)) +$(eval $(call gb_WinResTarget_add_file,quickstart/src,desktop/win32/source/QuickStart/OOQuickStart)) # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_sbase.mk b/desktop/WinResTarget_sbase.mk index b023e25fe3aa..506bb64b7ef3 100644 --- a/desktop/WinResTarget_sbase.mk +++ b/desktop/WinResTarget_sbase.mk @@ -23,24 +23,24 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_WinResTarget_WinResTarget,sbase)) +$(eval $(call gb_WinResTarget_WinResTarget,sbase/src)) -$(eval $(call gb_WinResTarget_set_include,sbase,\ +$(eval $(call gb_WinResTarget_set_include,sbase/src,\ $$(INCLUDE) \ -I$(SRCDIR)/sysui/desktop \ )) -$(eval $(call gb_WinResTarget_set_defs,sbase,\ +$(eval $(call gb_WinResTarget_set_defs,sbase/src,\ $$(DEFS) \ -DRES_APP_NAME=sbase \ -DRES_APP_ICON=icons/ooo3_base_app.ico \ -DVERVARIANT=$(BUILD) \ )) -$(eval $(call gb_WinResTarget_add_dependency,sbase,\ +$(eval $(call gb_WinResTarget_add_dependency,sbase/src,\ sysui/desktop/icons/ooo3_base_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,sbase,desktop/win32/source/applauncher/launcher)) +$(eval $(call gb_WinResTarget_add_file,sbase/src,desktop/win32/source/applauncher/launcher)) # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_scalc.mk b/desktop/WinResTarget_scalc.mk index 4edd6975c581..4113746d0c77 100644 --- a/desktop/WinResTarget_scalc.mk +++ b/desktop/WinResTarget_scalc.mk @@ -23,24 +23,24 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_WinResTarget_WinResTarget,scalc)) +$(eval $(call gb_WinResTarget_WinResTarget,scalc/src)) -$(eval $(call gb_WinResTarget_set_include,scalc,\ +$(eval $(call gb_WinResTarget_set_include,scalc/src,\ $$(INCLUDE) \ -I$(SRCDIR)/sysui/desktop \ )) -$(eval $(call gb_WinResTarget_set_defs,scalc,\ +$(eval $(call gb_WinResTarget_set_defs,scalc/src,\ $$(DEFS) \ -DRES_APP_NAME=scalc \ -DRES_APP_ICON=icons/ooo3_calc_app.ico \ -DVERVARIANT=$(BUILD) \ )) -$(eval $(call gb_WinResTarget_add_dependency,scalc,\ +$(eval $(call gb_WinResTarget_add_dependency,scalc/src,\ sysui/desktop/icons/ooo3_calc_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,scalc,desktop/win32/source/applauncher/launcher)) +$(eval $(call gb_WinResTarget_add_file,scalc/src,desktop/win32/source/applauncher/launcher)) # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_sdraw.mk b/desktop/WinResTarget_sdraw.mk index 1398a1a31c14..694c7daacc1a 100644 --- a/desktop/WinResTarget_sdraw.mk +++ b/desktop/WinResTarget_sdraw.mk @@ -23,24 +23,24 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_WinResTarget_WinResTarget,sdraw)) +$(eval $(call gb_WinResTarget_WinResTarget,sdraw/src)) -$(eval $(call gb_WinResTarget_set_include,sdraw,\ +$(eval $(call gb_WinResTarget_set_include,sdraw/src,\ $$(INCLUDE) \ -I$(SRCDIR)/sysui/desktop \ )) -$(eval $(call gb_WinResTarget_set_defs,sdraw,\ +$(eval $(call gb_WinResTarget_set_defs,sdraw/src,\ $$(DEFS) \ -DRES_APP_NAME=sdraw \ -DRES_APP_ICON=icons/ooo3_draw_app.ico \ -DVERVARIANT=$(BUILD) \ )) -$(eval $(call gb_WinResTarget_add_dependency,sdraw,\ +$(eval $(call gb_WinResTarget_add_dependency,sdraw/src,\ sysui/desktop/icons/ooo3_draw_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,sdraw,desktop/win32/source/applauncher/launcher)) +$(eval $(call gb_WinResTarget_add_file,sdraw/src,desktop/win32/source/applauncher/launcher)) # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_simpress.mk b/desktop/WinResTarget_simpress.mk index 1325f77b38b3..9a4b08fd08fe 100644 --- a/desktop/WinResTarget_simpress.mk +++ b/desktop/WinResTarget_simpress.mk @@ -23,24 +23,24 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_WinResTarget_WinResTarget,simpress)) +$(eval $(call gb_WinResTarget_WinResTarget,simpress/src)) -$(eval $(call gb_WinResTarget_set_include,simpress,\ +$(eval $(call gb_WinResTarget_set_include,simpress/src,\ $$(INCLUDE) \ -I$(SRCDIR)/sysui/desktop \ )) -$(eval $(call gb_WinResTarget_set_defs,simpress,\ +$(eval $(call gb_WinResTarget_set_defs,simpress/src,\ $$(DEFS) \ -DRES_APP_NAME=simpress \ -DRES_APP_ICON=icons/ooo3_impress_app.ico \ -DVERVARIANT=$(BUILD) \ )) -$(eval $(call gb_WinResTarget_add_dependency,simpress,\ +$(eval $(call gb_WinResTarget_add_dependency,simpress/src,\ sysui/desktop/icons/ooo3_impress_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,simpress,desktop/win32/source/applauncher/launcher)) +$(eval $(call gb_WinResTarget_add_file,simpress/src,desktop/win32/source/applauncher/launcher)) # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_smath.mk b/desktop/WinResTarget_smath.mk index 95f7516853c3..d531ae605961 100644 --- a/desktop/WinResTarget_smath.mk +++ b/desktop/WinResTarget_smath.mk @@ -23,24 +23,24 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_WinResTarget_WinResTarget,smath)) +$(eval $(call gb_WinResTarget_WinResTarget,smath/src)) -$(eval $(call gb_WinResTarget_set_include,smath,\ +$(eval $(call gb_WinResTarget_set_include,smath/src,\ $$(INCLUDE) \ -I$(SRCDIR)/sysui/desktop \ )) -$(eval $(call gb_WinResTarget_set_defs,smath,\ +$(eval $(call gb_WinResTarget_set_defs,smath/src,\ $$(DEFS) \ -DRES_APP_NAME=smath \ -DRES_APP_ICON=icons/ooo3_math_app.ico \ -DVERVARIANT=$(BUILD) \ )) -$(eval $(call gb_WinResTarget_add_dependency,smath,\ +$(eval $(call gb_WinResTarget_add_dependency,smath/src,\ sysui/desktop/icons/ooo3_math_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,smath,desktop/win32/source/applauncher/launcher)) +$(eval $(call gb_WinResTarget_add_file,smath/src,desktop/win32/source/applauncher/launcher)) # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_soffice.mk b/desktop/WinResTarget_soffice.mk index ba3c3d8108d8..2359f50502d0 100644 --- a/desktop/WinResTarget_soffice.mk +++ b/desktop/WinResTarget_soffice.mk @@ -23,24 +23,24 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_WinResTarget_WinResTarget,soffice)) +$(eval $(call gb_WinResTarget_WinResTarget,soffice/src)) -$(eval $(call gb_WinResTarget_set_include,soffice,\ +$(eval $(call gb_WinResTarget_set_include,soffice/src,\ $$(INCLUDE) \ -I$(SRCDIR)/sysui/desktop \ )) -$(eval $(call gb_WinResTarget_set_defs,soffice,\ +$(eval $(call gb_WinResTarget_set_defs,soffice/src,\ $$(DEFS) \ -DRES_APP_NAME=soffice \ -DRES_APP_ICON=icons/ooo3_main_app.ico \ -DVERVARIANT=$(BUILD) \ )) -$(eval $(call gb_WinResTarget_add_dependency,soffice,\ +$(eval $(call gb_WinResTarget_add_dependency,soffice/src,\ sysui/desktop/icons/ooo3_main_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,soffice,desktop/util/officeloader)) +$(eval $(call gb_WinResTarget_add_file,soffice/src,desktop/util/officeloader)) # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_sweb.mk b/desktop/WinResTarget_sweb.mk index 86c12bc6e737..2a0d74d9aae8 100644 --- a/desktop/WinResTarget_sweb.mk +++ b/desktop/WinResTarget_sweb.mk @@ -23,24 +23,24 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_WinResTarget_WinResTarget,sweb)) +$(eval $(call gb_WinResTarget_WinResTarget,sweb/src)) -$(eval $(call gb_WinResTarget_set_include,sweb,\ +$(eval $(call gb_WinResTarget_set_include,sweb/src,\ $$(INCLUDE) \ -I$(SRCDIR)/sysui/desktop \ )) -$(eval $(call gb_WinResTarget_set_defs,sweb,\ +$(eval $(call gb_WinResTarget_set_defs,sweb/src,\ $$(DEFS) \ -DRES_APP_NAME=sweb \ -DRES_APP_ICON=icons/ooo3_writer_app.ico \ -DVERVARIANT=$(BUILD) \ )) -$(eval $(call gb_WinResTarget_add_dependency,sweb,\ +$(eval $(call gb_WinResTarget_add_dependency,sweb/src,\ sysui/desktop/icons/ooo3_writer_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,sweb,desktop/win32/source/applauncher/launcher)) +$(eval $(call gb_WinResTarget_add_file,sweb/src,desktop/win32/source/applauncher/launcher)) # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_swriter.mk b/desktop/WinResTarget_swriter.mk index 6180c40ed572..26bc441faacb 100644 --- a/desktop/WinResTarget_swriter.mk +++ b/desktop/WinResTarget_swriter.mk @@ -23,24 +23,24 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_WinResTarget_WinResTarget,swriter)) +$(eval $(call gb_WinResTarget_WinResTarget,swriter/src)) -$(eval $(call gb_WinResTarget_set_include,swriter,\ +$(eval $(call gb_WinResTarget_set_include,swriter/src,\ $$(INCLUDE) \ -I$(SRCDIR)/sysui/desktop \ )) -$(eval $(call gb_WinResTarget_set_defs,swriter,\ +$(eval $(call gb_WinResTarget_set_defs,swriter/src,\ $$(DEFS) \ -DRES_APP_NAME=swriter \ -DRES_APP_ICON=icons/ooo3_writer_app.ico \ -DVERVARIANT=$(BUILD) \ )) -$(eval $(call gb_WinResTarget_add_dependency,swriter,\ +$(eval $(call gb_WinResTarget_add_dependency,swriter/src,\ sysui/desktop/icons/ooo3_writer_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,swriter,desktop/win32/source/applauncher/launcher)) +$(eval $(call gb_WinResTarget_add_file,swriter/src,desktop/win32/source/applauncher/launcher)) # vim: set ts=4 sw=4 et: |