Add better debugging support on Windows

diff --git a/aweather.nsi b/aweather.nsi
index aa27d56739f49c1d7a1a3e202751da3b561c8015..c897f01e1f9e66b14708f520653cb6bec87b574d 100644 (file)
--- a/aweather.nsi
+++ b/aweather.nsi
@@ -66,7 +66,7 @@ sectionEnd
 
 Section "Desktop Icons"
        setOutPath $INSTDIR\bin
 
 Section "Desktop Icons"
        setOutPath $INSTDIR\bin

-       CreateShortCut "$DESKTOP\AWeather.exe.lnk" "$INSTDIR\bin\aweather.exe" "" "$INSTDIR\bin\aweather.exe" 0
+       CreateShortCut "$DESKTOP\AWeather.lnk" "$INSTDIR\bin\aweather.exe" "" "$INSTDIR\bin\aweather.exe" 0

 SectionEnd
 
 Section "Start Menu Shortcuts"
 SectionEnd
 
 Section "Start Menu Shortcuts"


@@ -74,6 +74,7 @@ Section "Start Menu Shortcuts"
        CreateDirectory "$SMPROGRAMS\AWeather"
        CreateShortCut  "$SMPROGRAMS\AWeather\Uninstall AWeather.lnk" "$INSTDIR\uninstaller.exe"  "" "$INSTDIR\uninstaller.exe"  0
        CreateShortCut  "$SMPROGRAMS\AWeather\AWeather.lnk"           "$INSTDIR\bin\aweather.exe" "" "$INSTDIR\bin\aweather.exe" 0
        CreateDirectory "$SMPROGRAMS\AWeather"
        CreateShortCut  "$SMPROGRAMS\AWeather\Uninstall AWeather.lnk" "$INSTDIR\uninstaller.exe"  "" "$INSTDIR\uninstaller.exe"  0
        CreateShortCut  "$SMPROGRAMS\AWeather\AWeather.lnk"           "$INSTDIR\bin\aweather.exe" "" "$INSTDIR\bin\aweather.exe" 0

+       CreateShortCut  "$SMPROGRAMS\AWeather\AWeather (debug).lnk" "cmd.exe" "/K aweather-dbg.exe -d 7" "$INSTDIR\bin\aweather-dbg.exe" 0

 SectionEnd
 
 section "Uninstall"
 SectionEnd
 
 section "Uninstall"

diff --git a/configure.ac b/configure.ac
index 59d2c1b895c0146d6601ccadba4f7ff67b4b0e68..9050c93b89af41d7620fe2f6c4119e28b2d80858 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Init and options
 # Init and options

-AC_INIT([aweather], [0.4], [andy753421@gmail.com])
+AC_INIT([aweather], [0.4.1], [andy753421@gmail.com])

 AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability foreign])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability foreign])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])


@@ -15,7 +15,7 @@ gl_INIT
 
 # Check for required packages
 PKG_CHECK_MODULES(GLIB, glib-2.0)
 
 # Check for required packages
 PKG_CHECK_MODULES(GLIB, glib-2.0)

-PKG_CHECK_MODULES(GIS,  libgis = $VERSION)
+PKG_CHECK_MODULES(GIS,  libgis = 0.4)

 
 # Define odd RSL install location
 AC_CHECK_LIB(rsl, RSL_wsr88d_to_radar, RSL_LIBS="-lrsl")
 
 # Define odd RSL install location
 AC_CHECK_LIB(rsl, RSL_wsr88d_to_radar, RSL_LIBS="-lrsl")

diff --git a/src/Makefile.am b/src/Makefile.am
index 7bba88f8b6bc0714e886754d2ece864f2c9e2e8a..6a56bc4830308cc9a01698fe9a7f3f2fe68594be 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,9 +17,17 @@ wsr88ddec         = wsr88ddec.c
 wsr88ddec_LDADD   = $(GLIB_LIBS) -lbz2
 
 if WIN32
 wsr88ddec_LDADD   = $(GLIB_LIBS) -lbz2
 
 if WIN32

-AM_LDFLAGS       += -mwindows 
-aweather_SOURCES += resource.rc
-dots              = ..
+dots = ..
+
+wsr88ddec_LDFLAGS     = -mwindows
+
+aweather_SOURCES     += resource.rc
+aweather_LDFLAGS      = -mwindows
+
+bin_PROGRAMS         += aweather-dbg
+aweather_dbg_SOURCES  = $(aweather_SOURCES)
+aweather_dbg_CPPFLAGS = $(aweather_CPPFLAGS)
+aweather_dbg_LDADD    = $(aweather_LDADD)

 endif
 
 .rc.o: ../data/aweather.ico
 endif
 
 .rc.o: ../data/aweather.ico