Changeset 104 for trunk/mediafolder/res/makefile

Timestamp:

Oct 2, 2023, 11:34:35 PM (23 months ago)

Author:

gyoung

Message:

Remaining changes from merge with Lars 2.9 branch

Location:

trunk

Files:

• . (modified) (1 prop)
• mediafolder/res/makefile (modified) (5 diffs)

trunk/mediafolder/res/makefile

@@ -5 +5 @@
 
 CC           = icc
-CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
-INC     =       ..\include
+CPPFLAGS     = /Ge- /Gm+ /G4 /Gl- /Ga- /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
+INC     =       ..\\include
 INC2    =       ../include
-DEFS         = 
-PROGS        = 
+DEFS         =
+PROGS        =
 
 OBJDIR  =       ./obj
@@ -15 +15 @@
 HELPSOURCE      =       $(RESDIR2)/ipf
 
-OBJECTS = 
+OBJECTS =
 
 all:            $(OBJDIR)/version.h \
@@ -25 +25 @@
                 @for i in $(LANGUAGES); \
                 do \
-                        echo "[33;1;m Creating mediafolder_"$$i".dll[0;m";  \
-                        make LANGUAGE=$$i $(OBJDIR)/mediafolder_$$i.dll ; \
+                        echo "[33;1;m Creating mfldr_"$$i".dll[0;m";  \
+                        make LANGUAGE=$$i $(OBJDIR)/mfldr_$$i.dll ; \
                 done
 
@@ -35 +35 @@
 
 #### Resource DLL ####
-$(OBJDIR)/mediafolder_$(LANGUAGE).dll:  ./$(LANGUAGE)/mediafolder_$(LANGUAGE).c \
+$(OBJDIR)/mfldr_$(LANGUAGE).dll:        ./$(LANGUAGE)/mediafolder_$(LANGUAGE).c \
                                                 $(OBJDIR)/mediafolder_$(LANGUAGE).res
                 @./$(LANGUAGE)/create_res_$(LANGUAGE)_def.CMD $(OBJDIR)/mediafolder_$(LANGUAGE).def
-                icc $(CPPFLAGS) -I$(INC)  -c  /Fo$(OBJDIR)/mediafolder_$(LANGUAGE).obj $< 
+                icc $(CPPFLAGS) -I$(INC)  -c  /Fo$(OBJDIR)/mediafolder_$(LANGUAGE).obj $<
                 icc $(CPPFLAGS) -I$(INC) /Fe$@  $(OBJDIR)/mediafolder_$(LANGUAGE).obj ./obj/mediafolder_$(LANGUAGE).def
-                cd $(OBJDIR) && rc  mediafolder_$(LANGUAGE).res mediafolder_$(LANGUAGE).dll
+                cd $(OBJDIR) && rc  mediafolder_$(LANGUAGE).res mfldr_$(LANGUAGE).dll
         
 $(OBJDIR)/mediafolder_$(LANGUAGE).res:  ./$(LANGUAGE)/mediafolder_$(LANGUAGE).rc \
@@ -52 +52 @@
 
 mediafolder.res:                mediafolder.rc $(INC)\mediafolderres.h
-                rc -D $(ECS) -i $(INC) -i $(OBJDIR) -r mediafolder.rc 
+                rc -D $(ECS) -i $(INC) -i $(OBJDIR) -r mediafolder.rc
 
 clean: