Download as
Browse Code »

Commit 7c307cdad7a6ff0b61255333d95c1c25e25404f1

Authored by Perry Werneck
1 parent 411711ef
Exists in master and in 3 other branches develop, edit-header-bar, script-support

Fixing windows package.

Showing 2 changed files with 5 additions and 1 deletions   Show diff stats
@@ -255,7 +255,7 @@ $(BINRLS)/$(PACKAGE_NAME)@EXEEXT@: \ @@ -255,7 +255,7 @@ $(BINRLS)/$(PACKAGE_NAME)@EXEEXT@: \
255 @echo $< ... 255 @echo $< ...
256 @$(LD) \ 256 @$(LD) \
257 -o $@ \ 257 -o $@ \
258 - $(LDFLAGS) \ 258 + $(LDFLAGS) @RLS_LDFLAGS@ \
259 $^ \ 259 $^ \
260 $(LIBS) 260 $(LIBS)
261 261
@@ -63,6 +63,7 @@ dnl --------------------------------------------------------------------------- @@ -63,6 +63,7 @@ dnl ---------------------------------------------------------------------------
63 case "$host" in 63 case "$host" in
64 *-mingw32|*-pc-msys) 64 *-mingw32|*-pc-msys)
65 app_cv_osname="windows" 65 app_cv_osname="windows"
  66 + app_rls_ldflags="-mwindows"
66 67
67 CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600" 68 CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600"
68 LDFLAGS="$LDFLAGS -pthread" 69 LDFLAGS="$LDFLAGS -pthread"
@@ -71,6 +72,7 @@ case &quot;$host&quot; in @@ -71,6 +72,7 @@ case &quot;$host&quot; in
71 app_win32_revision=$(date +%-y.%-m.%-d.%-H) 72 app_win32_revision=$(date +%-y.%-m.%-d.%-H)
72 AC_SUBST(WIN32_VERSION,$app_win32_revision) 73 AC_SUBST(WIN32_VERSION,$app_win32_revision)
73 74
  75 +
74 app_win32_file_version=$(date +%-y,%-m,%-d,%-H) 76 app_win32_file_version=$(date +%-y,%-m,%-d,%-H)
75 AC_SUBST(WIN32_FILE_VERSION,$app_win32_file_version) 77 AC_SUBST(WIN32_FILE_VERSION,$app_win32_file_version)
76 78
@@ -100,6 +102,7 @@ case &quot;$host&quot; in @@ -100,6 +102,7 @@ case &quot;$host&quot; in
100 102
101 *) 103 *)
102 app_cv_osname="linux" 104 app_cv_osname="linux"
  105 + app_rls_ldflags=""
103 106
104 CFLAGS="$CFLAGS -pthread -DLIBDIR=\$(libdir)" 107 CFLAGS="$CFLAGS -pthread -DLIBDIR=\$(libdir)"
105 LDFLAGS="$LDFLAGS -pthread" 108 LDFLAGS="$LDFLAGS -pthread"
@@ -113,6 +116,7 @@ case &quot;$host&quot; in @@ -113,6 +116,7 @@ case &quot;$host&quot; in
113 esac 116 esac
114 117
115 AC_SUBST(OSNAME,$app_cv_osname) 118 AC_SUBST(OSNAME,$app_cv_osname)
  119 +AC_SUBST(RLS_LDFLAGS,$app_rls_ldflags)
116 AC_SUBST(LIBS) 120 AC_SUBST(LIBS)
117 AC_SUBST(LOGDIR) 121 AC_SUBST(LOGDIR)
118 AC_SUBST(DLLEXT) 122 AC_SUBST(DLLEXT)