Changeset 130 for branches/v2.9_Lars/classes/mm-progs/videoplayer

Timestamp:

Nov 9, 2023, 5:42:55 PM (2 years ago)

Author:

erdmann

Message:

merge from trunk CS 129

Location:

branches/v2.9_Lars

Files:

• . (modified) (1 prop)
• classes/mm-progs/videoplayer/makefile (modified) (2 diffs)
• classes/mm-progs/videoplayer/mmplayer.c (modified) (2 diffs)

branches/v2.9_Lars/classes/mm-progs/videoplayer/makefile

@@ -3 +3 @@
 include ../../../make.inc
 
-CC           = gcc
+CC           = icc
 LIB_DIR      = $d:/emx/lib
 #CPPFLAGS     = -Ge- /Gm+ -G4 -Gl  /O+ -Oc+ -Ol
 #CPPFLAGS     = -O -Zomf -Zcrtdll -Zmtd -s
-CPPFLAGS     = -O -Wall -Zomf -Zmt -s
+#CPPFLAGS     = -O -Wall -Zomf -Zmt -s
+CPPFLAGS        =  -Ge+ /Gm+ -G5 /Ss -Gl /O+ -Oc+ -Ol- /Q+
 INC             = ../include -I ../../../classes/inc -I ../../../common_functions/include
 DEFS         =
@@ -20 +21 @@
 all:    mmplayer.exe vioplayer.exe
 
-$(LIBDIR)/%.obj:        $(COMMONSRC)/%.c
-        gcc -c -Wall -o$@ -Zomf -I$(INC) $<
-
+$(LIBDIR)/%.obj:        $(COMMONSRC)/%.c 
+#       gcc -c -Wall -o$@ -Zomf -I$(INC) $<  
+        $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $<
 %.obj:  %.c
-        gcc -c -Wall -o$@ -Zomf -I$(INC) $<
-
+#       gcc -c -Wall -o$@ -Zomf -I$(INC) $<  
+        $(CC) $(CPPFLAGS) /C -I$(INC) /Fo$@ $<
 mmplayer.exe:   mmplayer.c $(OBJECTS) $(OBJS2) makefile
 #Use this command to link dynamicaly
-        gcc $(CPPFLAGS) -I$(INC) mmplayer.c $(OBJECTS) $(OBJS2) -lmmpm2.lib mmplayer.def
+        $(CC) $(CPPFLAGS) -I$(INC) mmplayer.c $(OBJECTS) $(OBJS2) mmpm2.lib mmplayer.def
         rc mmplayer.rc mmplayer.exe
 
 vioplayer.exe:  vioplayer.c
-        gcc $(CPPFLAGS) -I$(INC) vioplayer.c $(LIBDIR)/sys_funcs.obj -lmmpm2.lib mmplayer.def
+        $(CC) $(CPPFLAGS) -I$(INC) vioplayer.c $(LIBDIR)/sys_funcs.obj mmpm2.lib mmplayer.def
 
 clean:

branches/v2.9_Lars/classes/mm-progs/videoplayer/mmplayer.c

@@ -954 +954 @@
                       if(lPos/1000!=lLastPos) {
                         /* Prevent flickering */
-                        sprintf(chrCommand, "%d:%02d", lPos/1000/60, (lPos/1000)%60);
+                        sprintf(chrCommand, "%li:%02li", lPos/1000/60, (lPos/1000)%60);
                         WinSetWindowText(WinWindowFromID(hwnd, IDST_MMPLAYERPLAYTIME), chrCommand);
                         lLastPos=lPos/1000;
@@ -1027 +1027 @@
 
   if((fealist=malloc(0x00010000L /* Add some space */
-                     ))==NULLHANDLE)
+                     ))==NULL)
     return FALSE;