Changeset 21588 for trunk/testapp/common.mak

Timestamp:

Mar 14, 2011, 11:53:20 AM (15 years ago)

Author:

dmik

Message:

testapp: Added systray testcase (taken from ​http://www.codeproject.com/KB/shell/StealthDialog.aspx and slightly modified to build with Odin).

File:

• trunk/testapp/common.mak (modified) (3 diffs)

trunk/testapp/common.mak

@@ -13 +13 @@
 ODIN_DOS = $(subst /,\,$(ODIN))
 
-CFLAGS += -D__WIN32OS2__ -D__i386__ -DSTRICT -D_POSIX_SOURCE \
-          -D_POSIX_C_SOURCE=200112 -D_EMX_SOURCE -D_XOPEN_SOURCE=600 \
-          -D_SVID_SOURCE
-CFLAGS += -I$(ODIN)/include -I$(ODIN)/include/win
+DEFINES += -D__WIN32OS2__ -D__i386__ -DSTRICT -D_POSIX_SOURCE \
+           -D_POSIX_C_SOURCE=200112 -D_EMX_SOURCE -D_XOPEN_SOURCE=600 \
+           -D_SVID_SOURCE
 
-CFLAGS += -g -DDEBUG -L$(ODIN)/lib/Debug -lkernel32.lib
+INCLUDES += -I$(ODIN)/include -I$(ODIN)/include/win
+
+CFLAGS += $(DEFINES) $(INCLUDES) -g -DDEBUG -L$(ODIN)/lib/Debug -lkernel32.lib
 
 DEBUGGER = ipmd
+
+WRC = $(ODIN)/tools/wrc/bin/Release/wrc.exe
 
 run-%: %
         @echo [Running $<$(if $($<_ARGS), $($<_ARGS))]
         @echo.
-        @cmd /c "set BEGINLIBPATH=$(ODIN_DOS)/bin/Debug;$(ODIN_DOS)/bin;%BEGINLIBPATH% && $< $($<_ARGS)"
+        @cmd /c "set BEGINLIBPATH=$(ODIN)/bin/Debug;$(ODIN)/bin;%BEGINLIBPATH% && $< $($<_ARGS)"
         @echo.
 
@@ -31 +34 @@
         @echo [Running $<$(if $($<_ARGS), $($<_ARGS))]
         @echo.
-        @cmd /c "set BEGINLIBPATH=$(ODIN_DOS)/bin/Debug;$(ODIN_DOS)/bin;%BEGINLIBPATH% && $(DEBUGGER) $< $($<_ARGS)"
+        @cmd /c "set BEGINLIBPATH=$(ODIN)/bin/Debug;$(ODIN)/bin;%BEGINLIBPATH% && $(DEBUGGER) $< $($<_ARGS)"
         @echo.
         
@@ -42 +45 @@
 %.s: %.c
         gcc $< -S -Zomf -o $@ $(CFLAGS)
+
+%.s: %.rc
+        $(WRC) -s $(DEFINES) $(INCLUDES) $< -o $@
 
 CLEAN = *.exe *.map *.log