Changeset 243 for trunk/src/helpers/makefile

Timestamp:

Jan 29, 2003, 7:41:39 PM (23 years ago)

Author:

umoeller

Message:

New build system, multimedia, other misc fixes.

File:

• trunk/src/helpers/makefile (modified) (7 diffs)

trunk/src/helpers/makefile

@@ -1 @@
-# $Id$
-
 #
 # makefile:
@@ -9 +7 @@
 #       This makefile is even more complicated than the other makefiles
 #       because the helpers code has been designed to be independent
-#       of any single project. For example, the helpers code is used
-#       by XWorkplace also. As a result, I had to design a way so that
+#       of any single project. Presently the helpers code is used in
+#       XWorkplace and WarpIN. As a result, I had to design a way so that
 #       this makefile can produce output in a variable directory, with
 #       variable compiler flags, and so on. This is done via environment
-#       variables (see below).
+#       variables passed in from the "parent" makefile of a specific
+#       project.
 #
 #       Even worse, with V0.9.5, I chose to create a shared runtime DLL
@@ -85 +84 @@
 #
 
-# Say hello to yourself.
-!if [@echo +++++ Entering $(MAKEDIR)\makefile]
-!endif
-
-# helpers_pre.in: sets up more environment variables
-# and defines $(OBJ), which contains all object targets
+# set up shared environment variables
+!include ..\..\make\helpers.in
+# define $(OBJ), which contains all object targets
 !include helpers_pre.in
 
@@ -194 +190 @@
 TESTCASE_DIR = testcase
 
-DEBUGDIALOG =
+!undef DEBUGDIALOG
 !ifdef DBGDLG
 DEBUGDIALOG = /DDEBUG_DIALOG_WINDOWS=1
 !endif
 
-TESTCASE_CC = icc /c /ti+ /w2 /ss /se /D__DEBUG__=1 $(DEBUGDIALOG) /i$(HELPERS_BASE)\include /Fo$(TESTCASE_DIR)\$(@B).obj $(@B).c
+TESTCASE_CC_BASE = icc /c /ti+ /w2 /ss /se /D__DEBUG__=1 $(DEBUGDIALOG) /i..\..\include
+
+TESTCASE_CC = $(TESTCASE_CC_BASE) /Fo$(TESTCASE_DIR)\$(@B).obj  $(@B).c
 
 .c.{$(TESTCASE_DIR)}.obj:
@@ -212 +210 @@
     exeh.exe \
     fdlg.exe \
+    fdlg_pm.exe \
     xmap.exe \
     vcard.exe
@@ -265 +264 @@
 
 # fdlg.exe
-FDLG_TEST_OBJS = \
+FDLG_TEST_OBJS_SHARED = \
     $(TESTCASE_DIR)\comctl.obj \
     $(TESTCASE_DIR)\cctl_cnr.obj \
@@ -282 +281 @@
     $(TESTCASE_DIR)\tree.obj \
     $(TESTCASE_DIR)\nls.obj \
-    $(TESTCASE_DIR)\nlscache.obj \
+    $(TESTCASE_DIR)\nlscache.obj
+
+FDLG_TEST_OBJS = \
+    $(FDLG_TEST_OBJS_SHARED) \
     $(TESTCASE_DIR)\_call_filedlg.obj
 
-fdlg.exe: $(FDLG_TEST_OBJS)
-    ilink /debug /pmtype:pm $(FDLG_TEST_OBJS) pmprintf.lib /o:$@
+$(TESTCASE_DIR)\_call_filedlg_pm.obj: _call_filedlg.c
+    @echo $(MAKEDIR)\makefile: Compiling $(@B).c (PM version)
+    @echo INCLUDE is $(INCLUDE)
+    $(TESTCASE_CC_BASE) /D__USE_PM_CNR__=1 /Fo$(TESTCASE_DIR)\_call_filedlg_pm.obj _call_filedlg.c
+
+FDLG_TEST_OBJS_PM = \
+    $(FDLG_TEST_OBJS_SHARED) \
+    $(TESTCASE_DIR)\_call_filedlg_pm.obj
+
+fdlg.exe: $(FDLG_TEST_OBJS) makefile
+    @echo $(MAKEDIR)\makefile: Linking $@
+    ilink /nologo /debug /pmtype:pm $(FDLG_TEST_OBJS) pmprintf.lib /o:$@
+
+fdlg_pm.exe: $(FDLG_TEST_OBJS_PM) makefile
+    @echo $(MAKEDIR)\makefile: Linking $@ (PM version)
+    ilink /nologo /debug /pmtype:pm $(FDLG_TEST_OBJS_PM) pmprintf.lib /o:$@
 
 # xmap.exe