Add wxX11EventLoopSourcesManager stub implementation to fix wxX11 linking.

[wxWidgets.git] / utils / emulator / src / makefile.gcc

diff --git a/utils/emulator/src/makefile.gcc b/utils/emulator/src/makefile.gcc
index f8d2f6bb5463331f04104f7834ae7a520053d226..e6d063f3bef8f79bb2a734592ea247a483a00bb6 100644 (file)
--- a/utils/emulator/src/makefile.gcc
+++ b/utils/emulator/src/makefile.gcc
@@ -167,6 +167,9 @@ ifeq ($(MONOLITHIC),1)
 __WXLIB_MONO_p = \\r
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
 endif\r
 __WXLIB_MONO_p = \\r
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
 endif\r

+ifeq ($(MONOLITHIC),1)\r
+__LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
+endif\r

 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r


@@ -223,7 +226,7 @@ clean:
        -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe\r
 \r
 $(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample_rc.o\r
        -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe\r
 \r
 $(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample_rc.o\r

-       $(CXX) -o $@ $(WXEMULATOR_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
+       $(CXX) -o $@ $(WXEMULATOR_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r

 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r