HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix building with makefile.win32 from Windows command prompt, not MSYS

Browse Source
This commit is contained in:
Dimitar Zhekov 2012-06-26 21:39:56 +01:00 committed by Nick Treleaven
parent 40da14b5b1
commit 08d751daf2
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
makefile.win32
View File

@ -14,19 +14,17 @@
WINDRES = windres.exe
CC = gcc
CXX = g++
CP = copy
CP = copy /Y
RM = del
MAKE = make
MAKE = mingw32-make
-include localwin32.mk
# Note: && is needed after cd because each line is executed in a different
# shell. (cd .. is just for clarity).
all: config.h
cd tagmanager/mio && $(MAKE) -f makefile.win32 && cd ../..
cd tagmanager && $(MAKE) -f makefile.win32 && cd ..
cd scintilla && $(MAKE) -f makefile.win32 && cd ..
cd plugins && $(MAKE) -f makefile.win32 && cd ..
cd src && $(MAKE) -f makefile.win32 && cd ..
$(MAKE) -C tagmanager/mio -f makefile.win32
$(MAKE) -C tagmanager -f makefile.win32
$(MAKE) -C scintilla -f makefile.win32
$(MAKE) -C plugins -f makefile.win32
$(MAKE) -C src -f makefile.win32
config.h: win32-config.h
$(CP) $< $@
@ -39,11 +37,11 @@ clean-local:
-$(RM) geany_private.res geany.exe
clean: deps
cd tagmanager/mio && $(MAKE) -f makefile.win32 clean && cd ../..
cd tagmanager && $(MAKE) -f makefile.win32 clean && cd ..
cd scintilla && $(MAKE) -f makefile.win32 clean && cd ..
cd plugins && $(MAKE) -f makefile.win32 clean && cd ..
cd src && $(MAKE) -f makefile.win32 clean && cd ..
$(MAKE) -C tagmanager/mio -f makefile.win32 clean
$(MAKE) -C tagmanager -f makefile.win32 clean
$(MAKE) -C scintilla -f makefile.win32 clean
$(MAKE) -C plugins -f makefile.win32 clean
$(MAKE) -C src -f makefile.win32 clean
.PHONY: install
DESTDIR='C:/Program Files/Geany'

10
src/makefile.win32
View File

@ -77,7 +77,7 @@ $(RES): ../geany_private.rc ../icons/geany.ico
# this calls parent clean-local target because del ../file won't work
clean:
-$(RM) deps.mak *.o
cd .. && $(MAKE) -f makefile.win32 clean-local && cd src
$(MAKE) -C .. -f makefile.win32 clean-local
exec:
$(EXECDIR)\geany.exe
@ -85,10 +85,10 @@ exec:
binclean:
$(RM) $(TARGET)
$(TARGET): $(OBJS) $(RES) ../scintilla/scintilla.a ../tagmanager/mio/mio.a ../tagmanager/tagmanager.a
$(CXX) $(OBJS) $(RES) -o $(TARGET) \
../scintilla/scintilla.a ../tagmanager/tagmanager.a ../tagmanager/mio/mio.a \
$(ALL_GTK_LIBS) $(WIN_LIBS)
STLIBS = ../scintilla/scintilla.a ../tagmanager/tagmanager.a ../tagmanager/mio/mio.a
$(TARGET): $(OBJS) $(RES) $(STLIBS)
$(CXX) $(OBJS) $(RES) -o $(TARGET) $(STLIBS) $(ALL_GTK_LIBS) $(WIN_LIBS)
deps.mak:
$(CC) -MM $(CFLAGS) *.c >deps.mak