diff options
-rw-r--r-- | desktop/Executable_sbase.mk | 11 | ||||
-rw-r--r-- | desktop/Executable_scalc.mk | 11 | ||||
-rw-r--r-- | desktop/Executable_sdraw.mk | 11 | ||||
-rw-r--r-- | desktop/Executable_simpress.mk | 11 | ||||
-rw-r--r-- | desktop/Executable_smath.mk | 11 | ||||
-rw-r--r-- | desktop/Executable_sweb.mk | 11 | ||||
-rw-r--r-- | desktop/Executable_swriter.mk | 11 |
7 files changed, 42 insertions, 35 deletions
diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index 77d0c47b478c..9d35f56554da 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -15,17 +15,18 @@ $(eval $(call gb_Executable_add_defs,sbase,\ -DUNICODE \ )) +$(eval $(call gb_Executable_add_ldflags,sbase,\ + /ENTRY:wWinMainCRTStartup \ +)) + $(eval $(call gb_Executable_use_libraries,sbase,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_libs,sbase,\ - $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ +$(eval $(call gb_Executable_use_static_libraries,sbase,\ + winlauncher \ )) -$(call gb_Executable_get_target,sbase) : \ - $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) - $(eval $(call gb_Executable_add_exception_objects,sbase,\ desktop/win32/source/applauncher/sbase \ )) diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index 8c8cb42c7b06..0a0084979a64 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -15,17 +15,18 @@ $(eval $(call gb_Executable_add_defs,scalc,\ -DUNICODE \ )) +$(eval $(call gb_Executable_add_ldflags,scalc,\ + /ENTRY:wWinMainCRTStartup \ +)) + $(eval $(call gb_Executable_use_libraries,scalc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_libs,scalc,\ - $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ +$(eval $(call gb_Executable_use_static_libraries,scalc,\ + winlauncher \ )) -$(call gb_Executable_get_target,scalc) : \ - $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) - $(eval $(call gb_Executable_add_exception_objects,scalc,\ desktop/win32/source/applauncher/scalc \ )) diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index e3a4eef5debe..17f65ec6b770 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -15,17 +15,18 @@ $(eval $(call gb_Executable_add_defs,sdraw,\ -DUNICODE \ )) +$(eval $(call gb_Executable_add_ldflags,sdraw,\ + /ENTRY:wWinMainCRTStartup \ +)) + $(eval $(call gb_Executable_use_libraries,sdraw,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_libs,sdraw,\ - $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ +$(eval $(call gb_Executable_use_static_libraries,sdraw,\ + winlauncher \ )) -$(call gb_Executable_get_target,sdraw) : \ - $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) - $(eval $(call gb_Executable_add_exception_objects,sdraw,\ desktop/win32/source/applauncher/sdraw \ )) diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index 4d0648e1302a..d486f5716aff 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -15,17 +15,18 @@ $(eval $(call gb_Executable_add_defs,simpress,\ -DUNICODE \ )) +$(eval $(call gb_Executable_add_ldflags,simpress,\ + /ENTRY:wWinMainCRTStartup \ +)) + $(eval $(call gb_Executable_use_libraries,simpress,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_libs,simpress,\ - $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ +$(eval $(call gb_Executable_use_static_libraries,simpress,\ + winlauncher \ )) -$(call gb_Executable_get_target,simpress) : \ - $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) - $(eval $(call gb_Executable_add_exception_objects,simpress,\ desktop/win32/source/applauncher/simpress \ )) diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index 627ceb46b11f..980cc544edcd 100644 --- a/desktop/Executable_smath.mk +++ b/desktop/Executable_smath.mk @@ -15,17 +15,18 @@ $(eval $(call gb_Executable_add_defs,smath,\ -DUNICODE \ )) +$(eval $(call gb_Executable_add_ldflags,smath,\ + /ENTRY:wWinMainCRTStartup \ +)) + $(eval $(call gb_Executable_use_libraries,smath,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_libs,smath,\ - $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ +$(eval $(call gb_Executable_use_static_libraries,smath,\ + winlauncher \ )) -$(call gb_Executable_get_target,smath) : \ - $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) - $(eval $(call gb_Executable_add_exception_objects,smath,\ desktop/win32/source/applauncher/smath \ )) diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk index 901007cb5cc3..25efba659ec8 100644 --- a/desktop/Executable_sweb.mk +++ b/desktop/Executable_sweb.mk @@ -15,17 +15,18 @@ $(eval $(call gb_Executable_add_defs,sweb,\ -DUNICODE \ )) +$(eval $(call gb_Executable_add_ldflags,sweb,\ + /ENTRY:wWinMainCRTStartup \ +)) + $(eval $(call gb_Executable_use_libraries,sweb,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_libs,sweb,\ - $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ +$(eval $(call gb_Executable_use_static_libraries,sweb,\ + winlauncher \ )) -$(call gb_Executable_get_target,sweb) : \ - $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) - $(eval $(call gb_Executable_add_exception_objects,sweb,\ desktop/win32/source/applauncher/sweb \ )) diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk index cedefd06f058..f7b522800177 100644 --- a/desktop/Executable_swriter.mk +++ b/desktop/Executable_swriter.mk @@ -15,17 +15,18 @@ $(eval $(call gb_Executable_add_defs,swriter,\ -DUNICODE \ )) +$(eval $(call gb_Executable_add_ldflags,swriter,\ + /ENTRY:wWinMainCRTStartup \ +)) + $(eval $(call gb_Executable_use_libraries,swriter,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_libs,swriter,\ - $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ +$(eval $(call gb_Executable_use_static_libraries,swriter,\ + winlauncher \ )) -$(call gb_Executable_get_target,swriter) : \ - $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) - $(eval $(call gb_Executable_add_exception_objects,swriter,\ desktop/win32/source/applauncher/swriter \ )) |