Updated makefiles etc. for 2.5.1

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

diff --git a/samples/dynamic/makefile.gcc b/samples/dynamic/makefile.gcc
index 1b932bca35ebd8faf6422432842091a2e5c138f9..05bf8c635deb9f3a3bf014d4b58f7bcd87fe4525 100644 (file)
--- a/samples/dynamic/makefile.gcc
+++ b/samples/dynamic/makefile.gcc
@@ -14,8 +14,8 @@ include ../../build/msw/config.gcc
 
 DYNAMIC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 
 DYNAMIC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \

-       $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \
-       -I.\..\..\samples $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS)

 DYNAMIC_OBJECTS =  \
        $(OBJS)\dynamic_dynamic.o \
        $(OBJS)\dynamic_dynamic_rc.o
 DYNAMIC_OBJECTS =  \
        $(OBJS)\dynamic_dynamic.o \
        $(OBJS)\dynamic_dynamic_rc.o


@@ -112,10 +112,10 @@ ifeq ($(BUILD),release)
 __OPTIMIZEFLAG_2 = -O2
 endif
 ifeq ($(UNICODE),1)
 __OPTIMIZEFLAG_2 = -O2
 endif
 ifeq ($(UNICODE),1)

-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE

 endif
 ifeq ($(UNICODE),1)
 endif
 ifeq ($(UNICODE),1)

-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
+__UNICODE_DEFINE_p_1 = --define _UNICODE

 endif
 ifeq ($(MSLU),1)
 __UNICOWS_LIB_p = -lunicows
 endif
 ifeq ($(MSLU),1)
 __UNICOWS_LIB_p = -lunicows


@@ -151,13 +151,13 @@ $(OBJS)\dynamic_dynamic.o: ./dynamic.cpp
        $(CXX) -c -o $@ $(DYNAMIC_CXXFLAGS) $<
 
 $(OBJS)\dynamic_dynamic_rc.o: ./dynamic.rc
        $(CXX) -c -o $@ $(DYNAMIC_CXXFLAGS) $<
 
 $(OBJS)\dynamic_dynamic_rc.o: ./dynamic.rc

-       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples
+       windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples

 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\dynamic.exe del $(OBJS)\dynamic.exe
 
 $(OBJS)\dynamic.exe: $(DYNAMIC_OBJECTS) $(OBJS)\dynamic_dynamic_rc.o
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\dynamic.exe del $(OBJS)\dynamic.exe
 
 $(OBJS)\dynamic.exe: $(DYNAMIC_OBJECTS) $(OBJS)\dynamic_dynamic_rc.o

-       $(CXX) -o $@ $(DYNAMIC_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(DYNAMIC_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 
 .PHONY: all clean
 
 .PHONY: all clean