Changeset 295 for trunk/mkspecs

Timestamp:

Nov 6, 2009, 1:59:22 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

mkspecs/features/os2/default_post.prf: Refer to various components of the path to the implicitly generated .DEF file using make variables rather than qmake variables to make sure any future problems like the one fixed in r294 will not affect it.

File:

• trunk/mkspecs/features/os2/default_post.prf (modified) (1 diff)

trunk/mkspecs/features/os2/default_post.prf

@@ -3 +3 @@
 
 wlink:build_pass {
-    # Neither WLINK nor EMXOMFLD does allow us to specify the application type
-    # of the .EXE on the command line. For this reason, we need an implicit .DEF
+    # Neither WLINK nor EMXOMFLD allows us to specify the application type of
+    # the .EXE on the command line. For this reason, we need an implicit .DEF
     # file which we create unless an explicit .DEF file is provided in .pro.
     contains(TEMPLATE, ".*app") {
         isEmpty(DEF_FILE) {
-            isEmpty(OBJECTS_DIR) {
-                DEF_FILE = $${TARGET}.apptype.def
-            } else {
-                DEF_FILE = $${OBJECTS_DIR}/$${TARGET}.apptype.def
-            }
+            DEF_FILE = $(OBJECTS_DIR)/$(TARGET).def
 
             make_apptype_def.target = $(DEF_FILE)
             make_apptype_def.depends = $(call q,$(MAKEFILE))
             windows {
-                make_apptype_def.commands = @echo NAME $$TARGET WINDOWAPI > $(DEF_FILE)
+                make_apptype_def.commands = @echo NAME $(QMAKE_TARGET) WINDOWAPI > $(DEF_FILE)
             } else {
-                make_apptype_def.commands = @echo NAME $$TARGET WINDOWCOMPAT > $(DEF_FILE)
+                make_apptype_def.commands = @echo NAME $(QMAKE_TARGET) WINDOWCOMPAT > $(DEF_FILE)
             }
             QMAKE_EXTRA_TARGETS += make_apptype_def