fixing reentrancy which happened in tests, bringing client coordinates origins in...

[wxWidgets.git] / samples / keyboard / makefile.gcc

diff --git a/samples/keyboard/makefile.gcc b/samples/keyboard/makefile.gcc
index e1a9fd920bd693ee28b51ce5e387fa603ee0742e..bee1ed921426bca1b4a397de41cf820a8aeaf595 100644 (file)
--- a/samples/keyboard/makefile.gcc
+++ b/samples/keyboard/makefile.gcc
@@ -16,24 +16,31 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = gcc\r
 OBJS = \\r
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = gcc\r
 OBJS = \\r

-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
+       $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)

 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 KEYBOARD_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 KEYBOARD_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r

-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \

        $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
        $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \\r
        $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
        $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \\r
        $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r

-       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
+       -Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS)

 KEYBOARD_OBJECTS =  \\r
        $(OBJS)\keyboard_sample_rc.o \\r
        $(OBJS)\keyboard_keyboard.o\r
 \r
 ### Conditionally set variables: ###\r
 \r
 KEYBOARD_OBJECTS =  \\r
        $(OBJS)\keyboard_sample_rc.o \\r
        $(OBJS)\keyboard_keyboard.o\r
 \r
 ### Conditionally set variables: ###\r
 \r

+ifeq ($(TOOLKIT),GTK)
+WIN32_TOOLKIT_LOWERCASE = gtk
+endif
+ifeq ($(TOOLKIT),MSW)
+WIN32_TOOLKIT_LOWERCASE = msw
+endif

 ifeq ($(GCC_VERSION),2.95)\r
 GCCFLAGS = -fvtable-thunks\r
 endif\r
 ifeq ($(GCC_VERSION),2.95)\r
 GCCFLAGS = -fvtable-thunks\r
 endif\r


@@ -41,7 +48,13 @@ ifeq ($(USE_GUI),0)
 PORTNAME = base\r
 endif\r
 ifeq ($(USE_GUI),1)\r
 PORTNAME = base\r
 endif\r
 ifeq ($(USE_GUI),1)\r

-PORTNAME = msw\r
+PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+endif
+ifeq ($(TOOLKIT),MAC)
+WXBASEPORT = _carbon
+endif
+ifeq ($(OFFICIAL_BUILD),1)
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD

 endif\r
 ifeq ($(BUILD),debug)\r
 WXDEBUGFLAG = d\r
 endif\r
 ifeq ($(BUILD),debug)\r
 WXDEBUGFLAG = d\r


@@ -65,8 +78,18 @@ ifeq ($(MONOLITHIC),0)
 EXTRALIBS_FOR_BASE = \r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
 EXTRALIBS_FOR_BASE = \r
 endif\r
 ifeq ($(MONOLITHIC),1)\r

-EXTRALIBS_FOR_BASE =  \r
-endif\r
+EXTRALIBS_FOR_BASE =   \r
+endif\r
+ifeq ($(TOOLKIT),GTK)
+CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
+endif
+ifeq ($(TOOLKIT),GTK)
+ifeq ($(TOOLKIT_VERSION),2)
+LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
+       gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
+       glib-2.0.lib
+endif
+endif

 ifeq ($(BUILD),debug)\r
 __OPTIMIZEFLAG_2 = -O0\r
 endif\r
 ifeq ($(BUILD),debug)\r
 __OPTIMIZEFLAG_2 = -O0\r
 endif\r


@@ -157,7 +180,7 @@ __WXLIB_CORE_p = \
 endif\r
 ifeq ($(MONOLITHIC),0)\r
 __WXLIB_BASE_p = \\r
 endif\r
 ifeq ($(MONOLITHIC),0)\r
 __WXLIB_BASE_p = \\r

-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
+       -lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)

 endif\r
 ifeq ($(MONOLITHIC),1)\r
 __WXLIB_MONO_p = \\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
 __WXLIB_MONO_p = \\r


@@ -219,10 +242,10 @@ clean:
        -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe\r
 \r
 $(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_sample_rc.o\r
        -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe\r
 \r
 $(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_sample_rc.o\r

-       $(CXX) -o $@ $(KEYBOARD_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 $@ $(KEYBOARD_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) $(LIB_GTK)  -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
 $(OBJS)\keyboard_sample_rc.o: ./../../samples/sample.rc\r
 \r
 $(OBJS)\keyboard_sample_rc.o: ./../../samples/sample.rc\r

-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
+       windres --use-temp-file -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH

 \r
 $(OBJS)\keyboard_keyboard.o: ./keyboard.cpp\r
        $(CXX) -c -o $@ $(KEYBOARD_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\keyboard_keyboard.o: ./keyboard.cpp\r
        $(CXX) -c -o $@ $(KEYBOARD_CXXFLAGS) $(CPPDEPS) $<\r