The dummy.cpp hack makes no sense when it starts to contain
stuff. Better make it a real source file. Fixes compilation for people who didn't figure out they needed to remove dummy.cpp in the builddir ;-) svn path=/trunk/kdebase/kwin/; revision=63688
This commit is contained in:
parent
c56400145e
commit
c887e85912
2 changed files with 8 additions and 4 deletions
|
@ -13,7 +13,7 @@ kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version
|
||||||
|
|
||||||
include_HEADERS = KWinInterface.h
|
include_HEADERS = KWinInterface.h
|
||||||
|
|
||||||
kwin_SOURCES = dummy.cpp
|
kwin_SOURCES = kwin_main.cpp
|
||||||
kwin_LDADD = kwin.la
|
kwin_LDADD = kwin.la
|
||||||
kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH)
|
kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH)
|
||||||
|
|
||||||
|
@ -31,6 +31,3 @@ data_DATA= eventsrc
|
||||||
sounddir= $(kde_sounddir)
|
sounddir= $(kde_sounddir)
|
||||||
sound_DATA = pop.wav
|
sound_DATA = pop.wav
|
||||||
|
|
||||||
dummy.cpp:
|
|
||||||
echo 'extern "C" { int kdemain(int, char *[]);} int main(int c, char *v[]) { return kdemain(c,v); }' > dummy.cpp
|
|
||||||
|
|
||||||
|
|
7
kwin_main.cpp
Normal file
7
kwin_main.cpp
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
extern "C" { int kdemain(int, char *[]); }
|
||||||
|
|
||||||
|
int main(int c, char *v[])
|
||||||
|
{
|
||||||
|
return kdemain(c,v);
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue