Updated patblt test and .cvsignore

svn path=/trunk/; revision=5804

diff --git a/reactos/apps/tests/patblt/.cvsignore b/reactos/apps/tests/patblt/.cvsignore
new file mode 100644 (file)
index 0000000..d63774a
--- /dev/null
+++ b/reactos/apps/tests/patblt/.cvsignore
@@ -0,0 +1,6 @@
+*.o
+*.d
+*.exe
+*.coff
+*.sym
+*.map

diff --git a/reactos/apps/tests/patblt/makefile b/reactos/apps/tests/patblt/makefile
index a433ac4..ecf5d9a 100644 (file)
--- a/reactos/apps/tests/patblt/makefile
+++ b/reactos/apps/tests/patblt/makefile
@@ -1,66 +1,31 @@
-# Makefile - Proj_Listing2_1.dsp
 
-ifndef CFG
-CFG=Proj_Listing2_1 - Win32 Debug
-endif
-CC=gcc
-CFLAGS=
-CXX=g++
-CXXFLAGS=$(CFLAGS)
-RC=windres -O COFF
-ifeq "$(CFG)"  "Proj_Listing2_1 - Win32 Release"
-CFLAGS+=-fexceptions -O2 -DWIN32 -DNDEBUG -D_WINDOWS -D_MBCS -W
-LD=$(CXX) $(CXXFLAGS)
-LDFLAGS=
-LDFLAGS+=-Wl,--subsystem,windows
-LIBS+=-lkernel32 -luser32 -lgdi32
-else
-ifeq "$(CFG)"  "Proj_Listing2_1 - Win32 Debug"
-CFLAGS+=-fexceptions -g -O0 -DWIN32 -D_DEBUG -D_WINDOWS -D_MBCS -W
-LD=$(CXX) $(CXXFLAGS)
-LDFLAGS=
-LDFLAGS+=-Wl,--subsystem,windows
-LIBS+=-lkernel32 -luser32 -lgdi32
-endif
-endif
+PATH_TO_TOP = ../../..
 
-ifndef TARGET
-TARGET=patblt.exe
-endif
+TARGET_TYPE = program
 
-.PHONY: all
-all: $(TARGET)
+TARGET_APPTYPE = windows
 
-%.o: %.c
-       $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
+TARGET_NAME = patblt
 
-%.o: %.cpp
-       $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+TARGET_NORC = yes
 
-%.res: %.rc
-       $(RC) $(CPPFLAGS) -o $@ -i $<
+TARGET_CFLAGS = -fexceptions -g -O0 -DWIN32 -D_DEBUG -D_WINDOWS -D_MBCS -W -D__USE_W32API
+       
+TARGET_CPPFLAGS = -fexceptions -g -O0 -DWIN32 -D_DEBUG -D_WINDOWS -D_MBCS -W -D__USE_W32API
 
-SOURCE_FILES= \
-       patblt.cpp
+TARGET_SDKLIBS = \
+       kernel32.a \
+       user32.a \
+       gdi32.a
 
-HEADER_FILES=
+TARGET_OBJECTS = \
+       patblt.o
 
-RESOURCE_FILES=
+include $(PATH_TO_TOP)/rules.mak
 
-SRCS=$(SOURCE_FILES) $(HEADER_FILES) $(RESOURCE_FILES) 
+include $(TOOLS_PATH)/helper.mk
 
-OBJS=$(patsubst %.rc,%.res,$(patsubst %.cpp,%.o,$(patsubst %.c,%.o,$(filter %.c %.cpp %.rc,$(SRCS)))))
-
-$(TARGET): $(OBJS)
-       $(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-
-.PHONY: clean
-clean:
-       -del $(OBJS) $(TARGET)
-
-.PHONY: depends
-depends:
-       -$(CXX) $(CXXFLAGS) $(CPPFLAGS) -MM $(filter %.c %.cpp,$(SRCS)) > Proj_Listing2_1.dep
-
--include Proj_Listing2_1.dep
+# overide LD_CC to use g++ for linking of the executable
+LD_CC = $(CXX)
 
+# EOF

diff --git a/reactos/apps/tests/patblt/patblt.cpp b/reactos/apps/tests/patblt/patblt.cpp
index f156fa5..84c5d7b 100644 (file)
--- a/reactos/apps/tests/patblt/patblt.cpp
+++ b/reactos/apps/tests/patblt/patblt.cpp
@@ -230,9 +230,7 @@ LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam,
       {  
          PAINTSTRUCT ps;
          HDC Hdc = BeginPaint(HWnd, &ps);
-#if 0
          try
-#endif
          {
             // 
             // TODO: Add palette support...
@@ -245,9 +243,7 @@ LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam,
                    HMemDC, 0, 0, 
                    SRCCOPY);
          }
-#if 0
          catch (...)
-#endif
          {
             EndPaint(HWnd, &ps);
          }