SF.net SVN: geany: [2487] trunk
eht16 at users.sourceforge.net
eht16 at xxxxx
Tue Apr 15 15:11:06 UTC 2008
Revision: 2487
http://geany.svn.sourceforge.net/geany/?rev=2487&view=rev
Author: eht16
Date: 2008-04-15 08:11:05 -0700 (Tue, 15 Apr 2008)
Log Message:
-----------
Add DEBUG flag to all Windows makefiles to make it possible to build with debug symbols and without optimizations also on Windows (using make DEBUG=1).
Modified Paths:
--------------
trunk/ChangeLog
trunk/plugins/makefile.win32
trunk/scintilla/makefile.win32
trunk/src/makefile.win32
trunk/tagmanager/makefile.win32
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-04-15 15:02:45 UTC (rev 2486)
+++ trunk/ChangeLog 2008-04-15 15:11:05 UTC (rev 2487)
@@ -2,6 +2,11 @@
* doc/images/pref_dialog_gen.png:
Update for 0.14.
+ * plugins/makefile.win32, scintilla/makefile.win32, src/makefile.win32,
+ tagmanager/makefile.win32:
+ Add DEBUG flag to all Windows makefiles to make it possible to build
+ with debug symbols and without optimizations also on Windows
+ (using make DEBUG=1).
2008-04-13 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/plugins/makefile.win32
===================================================================
--- trunk/plugins/makefile.win32 2008-04-15 15:02:45 UTC (rev 2486)
+++ trunk/plugins/makefile.win32 2008-04-15 15:11:05 UTC (rev 2487)
@@ -30,14 +30,20 @@
-lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 \
-lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl -liconv
-CCFLAGS=-Wall -O2 -mms-bitfields -DHAVE_CONFIG_H
+CBASEFLAGS=-Wall -pipe -mms-bitfields -DHAVE_CONFIG_H
+ifdef DEBUG
+CFLAGS=-O0 -g $(CBASEFLAGS)
+else
+CFLAGS=-O2 $(CBASEFLAGS)
+endif
+
.PHONY: all clean plugins
all: plugins
.c.dll:
- $(CC) $(CCFLAGS) $(DEFINES) $(INCLUDEDIRS) -o $@.o -c $<
+ $(CC) $(CFLAGS) $(DEFINES) $(INCLUDEDIRS) -o $@.o -c $<
$(CC) -shared $@.o $(ALL_GTK_LIBS) $(DLL_LD_FLAGS) -o $@
plugins: \
@@ -53,7 +59,7 @@
-$(RM) deps.mak *.o *.dll
deps.mak:
- $(CC) -MM $(CCFLAGS) $(DEFINES) $(INCLUDEDIRS) *.c >deps.mak
+ $(CC) -MM $(CFLAGS) $(DEFINES) $(INCLUDEDIRS) *.c >deps.mak
# Generate header dependencies with "make deps.mak"
include deps.mak
Modified: trunk/scintilla/makefile.win32
===================================================================
--- trunk/scintilla/makefile.win32 2008-04-15 15:02:45 UTC (rev 2486)
+++ trunk/scintilla/makefile.win32 2008-04-15 15:11:05 UTC (rev 2487)
@@ -44,7 +44,7 @@
endif
ifdef DEBUG
-CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
+CXXFLAGS=-DDEBUG -g -O0 $(CXXBASEFLAGS) $(THREADFLAGS)
else
CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
endif
Modified: trunk/src/makefile.win32
===================================================================
--- trunk/src/makefile.win32 2008-04-15 15:02:45 UTC (rev 2486)
+++ trunk/src/makefile.win32 2008-04-15 15:11:05 UTC (rev 2487)
@@ -52,7 +52,12 @@
WIN_LIBS=-mwindows -lkernel32 -limm32 -lshfolder -lshell32 \
-lole32 -luuid -lcomdlg32 -lcomctl32 -liberty -lwsock32
-CCFLAGS=-Wall -O2 -g -mms-bitfields $(DEFINES) $(INCLUDEDIRS)
+CBASEFLAGS=-Wall -pipe -mms-bitfields $(DEFINES) $(INCLUDEDIRS)
+ifdef DEBUG
+CFLAGS=-O0 -g $(CBASEFLAGS)
+else
+CFLAGS=-O2 $(CBASEFLAGS)
+endif
OBJS = about.o build.o callbacks.o dialogs.o document.o editor.o encodings.o filetypes.o \
geanyobject.o geanywraplabel.o highlighting.o interface.o keybindings.o keyfile.o \
@@ -61,7 +66,7 @@
ui_utils.o utils.o win32.o
.c.o:
- $(CC) $(CCFLAGS) -c $<
+ $(CC) $(CFLAGS) -c $<
# all: binclean $(TARGET) #exec
all: $(TARGET)
@@ -86,7 +91,7 @@
$(WIN_LIBS)
deps.mak:
- $(CC) -MM $(CCFLAGS) *.c >deps.mak
+ $(CC) -MM $(CFLAGS) *.c >deps.mak
# Generate header dependencies with "make deps.mak"
include deps.mak
Modified: trunk/tagmanager/makefile.win32
===================================================================
--- trunk/tagmanager/makefile.win32 2008-04-15 15:02:45 UTC (rev 2486)
+++ trunk/tagmanager/makefile.win32 2008-04-15 15:11:05 UTC (rev 2487)
@@ -24,10 +24,15 @@
INCLUDEDIRS=-I include $(GTK_INCLUDES)
-CCFLAGS=-Wall -O2 -g -mms-bitfields -DPACKAGE=\"geany\" -DG_OS_WIN32 -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS)
+CBASEFLAGS=-Wall -pipe -mms-bitfields -DPACKAGE=\"geany\" -DG_OS_WIN32 -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS)
+ifdef DEBUG
+CFLAGS= -O0 -g $(CBASEFLAGS)
+else
+CFLAGS=-O2 $(CBASEFLAGS)
+endif
.c.o:
- $(CC) $(REGEX_DEFINES) $(CCFLAGS) -w -c $<
+ $(CC) $(REGEX_DEFINES) $(CFLAGS) -w -c $<
all: $(COMPLIB)
@@ -43,7 +48,7 @@
$(RANLIB) $@
deps.mak:
- $(CC) -MM $(CCFLAGS) *.c >deps.mak
+ $(CC) -MM $(CFLAGS) *.c >deps.mak
# Generate header dependencies with "make deps.mak"
include deps.mak
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list