fixes potential crash under gatekeeper

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

diff --git a/samples/dll/makefile.gcc b/samples/dll/makefile.gcc
index 743340a62e41557a2057aff9a9df92039f783f81..a364501ed8266e60be53f6c75ca4fcd8694ffb10 100644 (file)
--- a/samples/dll/makefile.gcc
+++ b/samples/dll/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This makefile was generated by\r
 # =========================================================================\r
 #     This makefile was generated by\r

-#     Bakefile 0.2.8 (http://www.bakefile.org)\r
+#     Bakefile 0.2.9 (http://www.bakefile.org)\r

 #     Do not modify, all changes will be overwritten!\r
 # =========================================================================\r
 \r
 #     Do not modify, all changes will be overwritten!\r
 # =========================================================================\r
 \r


@@ -16,32 +16,45 @@ 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)\r
+LIBDIRNAME = \\r
+       .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)\r

 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 MY_DLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \\r
 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 MY_DLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \\r

-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
+       -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r

        -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \\r
        -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \\r

-       $(__DLLFLAG_p) -I. $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \\r
-       $(CPPFLAGS) $(CXXFLAGS)\r
+       $(__DLLFLAG_p) -DMY_DLL_BUILDING -I. $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \\r
+       -Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS)\r

 MY_DLL_OBJECTS =  \\r
        $(OBJS)\my_dll_my_dll.o\r
 WX_EXE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \\r
 MY_DLL_OBJECTS =  \\r
        $(OBJS)\my_dll_my_dll.o\r
 WX_EXE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \\r

-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
+       -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r

        -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \\r
        -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG) \\r
        -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \\r
        -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG) \\r

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

 WX_EXE_OBJECTS =  \\r
        $(OBJS)\wx_exe_sample_rc.o \\r
 WX_EXE_OBJECTS =  \\r
        $(OBJS)\wx_exe_sample_rc.o \\r

-       $(OBJS)\wx_exe_dll_user_wx.o\r
+       $(OBJS)\wx_exe_wx_exe.o\r
+SDK_EXE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \\r
+       $(GCCFLAGS) -DHAVE_W32API_H $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \\r
+       $(CXXFLAGS)\r
+SDK_EXE_OBJECTS =  \\r
+       $(OBJS)\sdk_exe_sdk_exe.o\r

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r

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

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


@@ -49,7 +62,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)\r
+endif\r
+ifeq ($(TOOLKIT),MAC)\r
+WXBASEPORT = _carbon\r
+endif\r
+ifeq ($(OFFICIAL_BUILD),1)\r
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD\r

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


@@ -73,7 +92,17 @@ 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
+EXTRALIBS_FOR_BASE =   \r
+endif\r
+ifeq ($(TOOLKIT),GTK)\r
+CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields\r
+endif\r
+ifeq ($(TOOLKIT),GTK)\r
+ifeq ($(TOOLKIT_VERSION),2)\r
+LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \\r
+       gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \\r
+       glib-2.0.lib\r
+endif\r

 endif\r
 ifeq ($(SHARED),0)\r
 __wx_exe___depname = $(OBJS)\wx_exe.exe\r
 endif\r
 ifeq ($(SHARED),0)\r
 __wx_exe___depname = $(OBJS)\wx_exe.exe\r


@@ -84,6 +113,9 @@ endif
 ifeq ($(DEBUG_FLAG),0)\r
 __DEBUG_DEFINE_p_3 = --define wxDEBUG_LEVEL=0\r
 endif\r
 ifeq ($(DEBUG_FLAG),0)\r
 __DEBUG_DEFINE_p_3 = --define wxDEBUG_LEVEL=0\r
 endif\r

+ifeq ($(BUILD),release)\r
+__NDEBUG_DEFINE_p_3 = --define NDEBUG\r
+endif\r

 ifeq ($(USE_EXCEPTIONS),0)\r
 __EXCEPTIONS_DEFINE_p_3 = --define wxNO_EXCEPTIONS\r
 endif\r
 ifeq ($(USE_EXCEPTIONS),0)\r
 __EXCEPTIONS_DEFINE_p_3 = --define wxNO_EXCEPTIONS\r
 endif\r


@@ -102,39 +134,21 @@ endif
 ifeq ($(MSLU),1)\r
 __MSLU_DEFINE_p_3 = --define wxUSE_UNICODE_MSLU=1\r
 endif\r
 ifeq ($(MSLU),1)\r
 __MSLU_DEFINE_p_3 = --define wxUSE_UNICODE_MSLU=1\r
 endif\r

-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_3 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r

 ifeq ($(USE_CAIRO),1)\r
 __CAIRO_INCLUDEDIR_p_1 = --include-dir $(CAIRO_ROOT)/include/cairo\r
 endif\r
 ifeq ($(SHARED),1)\r
 __DLLFLAG_p_3 = --define WXUSINGDLL\r
 endif\r
 ifeq ($(USE_CAIRO),1)\r
 __CAIRO_INCLUDEDIR_p_1 = --include-dir $(CAIRO_ROOT)/include/cairo\r
 endif\r
 ifeq ($(SHARED),1)\r
 __DLLFLAG_p_3 = --define WXUSINGDLL\r
 endif\r

-ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG = -O0\r
-endif\r
-ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG = -O2\r
-endif\r
-ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG = -fno-rtti\r
-endif\r
-ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG = \r
-endif\r
-ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG = -fno-exceptions\r
-endif\r
-ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG = \r
-endif\r

 ifeq ($(WXUNIV),1)\r
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
 endif\r
 ifeq ($(DEBUG_FLAG),0)\r
 __DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
 endif\r
 ifeq ($(WXUNIV),1)\r
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
 endif\r
 ifeq ($(DEBUG_FLAG),0)\r
 __DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
 endif\r

+ifeq ($(BUILD),release)\r
+__NDEBUG_DEFINE_p = -DNDEBUG\r
+endif\r

 ifeq ($(USE_EXCEPTIONS),0)\r
 __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
 endif\r
 ifeq ($(USE_EXCEPTIONS),0)\r
 __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
 endif\r


@@ -153,9 +167,6 @@ endif
 ifeq ($(MSLU),1)\r
 __MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
 endif\r
 ifeq ($(MSLU),1)\r
 __MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
 endif\r

-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r

 ifeq ($(USE_CAIRO),1)\r
 ____CAIRO_INCLUDEDIR_FILENAMES = -I$(CAIRO_ROOT)\include\cairo\r
 endif\r
 ifeq ($(USE_CAIRO),1)\r
 ____CAIRO_INCLUDEDIR_FILENAMES = -I$(CAIRO_ROOT)\include\cairo\r
 endif\r


@@ -168,7 +179,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)\r

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


@@ -186,9 +197,6 @@ endif
 ifeq ($(MSLU),1)\r
 __UNICOWS_LIB_p = -lunicows\r
 endif\r
 ifeq ($(MSLU),1)\r
 __UNICOWS_LIB_p = -lunicows\r
 endif\r

-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r

 ifeq ($(USE_CAIRO),1)\r
 __CAIRO_LIB_p = -lcairo\r
 endif\r
 ifeq ($(USE_CAIRO),1)\r
 __CAIRO_LIB_p = -lcairo\r
 endif\r


@@ -196,6 +204,24 @@ ifeq ($(USE_CAIRO),1)
 ____CAIRO_LIBDIR_FILENAMES = -L$(CAIRO_ROOT)\lib\r
 endif\r
 ifeq ($(BUILD),debug)\r
 ____CAIRO_LIBDIR_FILENAMES = -L$(CAIRO_ROOT)\lib\r
 endif\r
 ifeq ($(BUILD),debug)\r

+__OPTIMIZEFLAG = -O0\r
+endif\r
+ifeq ($(BUILD),release)\r
+__OPTIMIZEFLAG = -O2\r
+endif\r
+ifeq ($(USE_RTTI),0)\r
+__RTTIFLAG = -fno-rtti\r
+endif\r
+ifeq ($(USE_RTTI),1)\r
+__RTTIFLAG = \r
+endif\r
+ifeq ($(USE_EXCEPTIONS),0)\r
+__EXCEPTIONSFLAG = -fno-exceptions\r
+endif\r
+ifeq ($(USE_EXCEPTIONS),1)\r
+__EXCEPTIONSFLAG = \r
+endif\r
+ifeq ($(BUILD),debug)\r

 ifeq ($(DEBUG_INFO),default)\r
 __DEBUGINFO = -g\r
 endif\r
 ifeq ($(DEBUG_INFO),default)\r
 __DEBUGINFO = -g\r
 endif\r


@@ -225,7 +251,7 @@ $(OBJS):
 \r
 ### Targets: ###\r
 \r
 \r
 ### Targets: ###\r
 \r

-all: $(OBJS)\my_dll.dll $(__wx_exe___depname)\r
+all: $(OBJS)\my_dll.dll $(__wx_exe___depname) $(OBJS)\sdk_exe.exe\r

 \r
 clean: \r
        -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
 \r
 clean: \r
        -if exist $(OBJS)\*.o del $(OBJS)\*.o\r


@@ -233,24 +259,31 @@ clean:
        -if exist $(OBJS)\my_dll.dll del $(OBJS)\my_dll.dll\r
        -if exist $(OBJS)\libmy_dll.a del $(OBJS)\libmy_dll.a\r
        -if exist $(OBJS)\wx_exe.exe del $(OBJS)\wx_exe.exe\r
        -if exist $(OBJS)\my_dll.dll del $(OBJS)\my_dll.dll\r
        -if exist $(OBJS)\libmy_dll.a del $(OBJS)\libmy_dll.a\r
        -if exist $(OBJS)\wx_exe.exe del $(OBJS)\wx_exe.exe\r

+       -if exist $(OBJS)\sdk_exe.exe del $(OBJS)\sdk_exe.exe\r

 \r
 $(OBJS)\my_dll.dll: $(MY_DLL_OBJECTS)\r
 \r
 $(OBJS)\my_dll.dll: $(MY_DLL_OBJECTS)\r

-       $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(MY_DLL_OBJECTS)  -Wl,--out-implib=$(OBJS)\libmy_dll.a $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(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) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
+       $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(MY_DLL_OBJECTS)  -Wl,--out-implib=$(OBJS)\libmy_dll.a $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(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

 \r
 ifeq ($(SHARED),0)\r
 $(OBJS)\wx_exe.exe: $(WX_EXE_OBJECTS) $(OBJS)\wx_exe_sample_rc.o $(OBJS)\my_dll.dll\r
 \r
 ifeq ($(SHARED),0)\r
 $(OBJS)\wx_exe.exe: $(WX_EXE_OBJECTS) $(OBJS)\wx_exe_sample_rc.o $(OBJS)\my_dll.dll\r

-       $(CXX) -o $@ $(WX_EXE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(OBJS)\libmy_dll.a $(__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) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
+       $(CXX) -o $@ $(WX_EXE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(OBJS)\libmy_dll.a $(__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

 endif\r
 \r
 endif\r
 \r

+$(OBJS)\sdk_exe.exe: $(SDK_EXE_OBJECTS) $(OBJS)\my_dll.dll\r
+       $(CXX) -o $@ $(SDK_EXE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(OBJS)\libmy_dll.a -luser32\r
+\r

 $(OBJS)\my_dll_my_dll.o: ./my_dll.cpp\r
        $(CXX) -c -o $@ $(MY_DLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\wx_exe_sample_rc.o: ./../../samples/sample.rc\r
 $(OBJS)\my_dll_my_dll.o: ./my_dll.cpp\r
        $(CXX) -c -o $@ $(MY_DLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\wx_exe_sample_rc.o: ./../../samples/sample.rc\r

-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) $(__GFXCTX_DEFINE_p_3) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p_1) --include-dir . $(__DLLFLAG_p_3) --include-dir ./../../samples --define NOPCH\r
+       windres --use-temp-file -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__NDEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p_1) --include-dir . $(__DLLFLAG_p_3) --include-dir ./../../samples --define NOPCH\r

 \r
 \r

-$(OBJS)\wx_exe_dll_user_wx.o: ./dll_user_wx.cpp\r
+$(OBJS)\wx_exe_wx_exe.o: ./wx_exe.cpp\r

        $(CXX) -c -o $@ $(WX_EXE_CXXFLAGS) $(CPPDEPS) $<\r
 \r
        $(CXX) -c -o $@ $(WX_EXE_CXXFLAGS) $(CPPDEPS) $<\r
 \r

+$(OBJS)\sdk_exe_sdk_exe.o: ./sdk_exe.cpp\r
+       $(CXX) -c -o $@ $(SDK_EXE_CXXFLAGS) $(CPPDEPS) $<\r
+\r

 .PHONY: all clean\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r