Changeset 126

Timestamp:

Oct 29, 2023, 11:01:57 PM (22 months ago)

Author:

gyoung

Message:

Changes to build players and related cwmm class exe using VAC 3.08

Location:

trunk

Files:

• classes/mm-progs/MMPlayer/makefile (modified) (1 diff)
• classes/mm-progs/audioconverter/audconv.c (modified) (5 diffs)
• classes/mm-progs/audioconverter/makefile (modified) (1 diff)
• classes/mm-progs/imageconverter/makefile (modified) (1 diff)
• classes/mm-progs/master_volume/makefile (modified) (1 diff)
• classes/mm-progs/mmfind/makefile (modified) (1 diff)
• classes/mm-progs/mmfind/mmfind.c (modified) (1 diff)
• classes/mm-progs/videoplayer/makefile (modified) (2 diffs)
• classes/mm-progs/volume/makefile (modified) (2 diffs)
• common_functions/helper.c (modified) (2 diffs)

trunk/classes/mm-progs/MMPlayer/makefile

@@ -17 +17 @@
         cmd /C $(TOOLDIR)\create_MMPROG_def.cmd mmplayer.def
 #Use this command to link dynamicaly
-        $(CC) $(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
 

trunk/classes/mm-progs/audioconverter/audconv.c

@@ -350 +350 @@
           {
             UCHAR text[500];
-            snprintf((PCHAR)text, sizeof(text)-1,"mmioOpen error with file %s\n", chrSourceName);
+            sprintf((PCHAR)text,/* sizeof(text)-1,*/"mmioOpen error with file %s\n", chrSourceName);
             WinMessageBox(hwnd, hwnd, (PSZ)"",
                           text,
@@ -362 +362 @@
           UCHAR text[500];
           mmioClose(hmmio, 0);
-          snprintf((PCHAR)text, sizeof(text)-1,"mmioGetHeader error!");
+          sprintf((PCHAR)text, /*sizeof(text)-1,*/"mmioGetHeader error!");
           WinMessageBox(hwnd, hwnd, (PSZ)"",
                         text,
@@ -384 +384 @@
             rc=mmioGetLastError(hmmioTarget);
             mciGetErrorString(mmioinfo.ulErrorRet ,chrError, sizeof(chrError)-1);
-            snprintf((PCHAR)text, sizeof(text)-1,"mmioOpen error with file %s:\n%s\n%lu", chrTargetName, chrError,mmioinfo.ulErrorRet);
+            sprintf((PCHAR)text, /*sizeof(text)-1,*/"mmioOpen error with file %s:\n%s\n%lu", chrTargetName, chrError,mmioinfo.ulErrorRet);
             mmioClose(hmmio,0);
             WinMessageBox(hwnd, hwnd, (PSZ)"",
@@ -400 +400 @@
           mmioClose(hmmio, 0);
           mmioClose(hmmioTarget,0);
-          snprintf((PCHAR)text, sizeof(text)-1,"Can't get memory buffer!");
+          sprintf((PCHAR)text, /*sizeof(text)-1,*/"Can't get memory buffer!");
           WinMessageBox(hwnd, hwnd, (PSZ)"",
                         text,
@@ -422 +422 @@
         if(rc==MMIO_ERROR) {
           UCHAR text[500];
-          snprintf((PCHAR)text, sizeof(text)-1,"Error while reading audio data!");
+          sprintf((PCHAR)text, /*sizeof(text)-1,*/"Error while reading audio data!");
           WinMessageBox(hwnd, hwnd, (PSZ)"",
                         text,

trunk/classes/mm-progs/audioconverter/makefile

@@ -16 +16 @@
 audconv.exe:    audconv.c $(OBJECTS) makefile def.tpl
         cmd /C $(TOOLDIR)\create_MMPROG_def.cmd audconv.def
-        $(CC) $(CPPFLAGS) -I$(INC) audconv.c $(OBJECTS) -lmmpm2.lib audconv.def
+        $(CC) $(CPPFLAGS) -I$(INC) audconv.c $(OBJECTS) mmpm2.lib audconv.def
 
 

trunk/classes/mm-progs/imageconverter/makefile

@@ -15 +15 @@
         cmd /C $(TOOLDIR)\create_MMPROG_def.cmd imgconv.def
 #Use this command to link dynamicaly
-        $(CC) $(CPPFLAGS) -I$(INC) imgconv.c $(OBJECTS) -lmmpm2.lib imgconv.def
+        $(CC) $(CPPFLAGS) -I$(INC) imgconv.c $(OBJECTS) mmpm2.lib imgconv.def
 
 clean:

trunk/classes/mm-progs/master_volume/makefile

@@ -17 +17 @@
 volume.exe:     volume.c $(OBJECTS) makefile def.tpl
         cmd /C $(TOOLDIR)\create_MMPROG_def.cmd volume.def
-        $(CC) $(CPPFLAGS) -I$(INC) volume.c $(OBJECTS) -lmmpm2.lib volume.def
+        $(CC) $(CPPFLAGS) -I$(INC) volume.c $(OBJECTS) mmpm2.lib volume.def
         rc -I $(INC) volume.rc volume.exe
 

trunk/classes/mm-progs/mmfind/makefile

@@ -20 +20 @@
 #Use this command to link dynamicaly
         cmd /C $(TOOLDIR)\create_MMPROG_def.cmd mmfind.def
-        gcc $(CPPFLAGS) -I$(INC) mmfind.c $(LIBOBJECTS) $(OBJECTS) -lmmpm2.lib mmfind.def
+        icc $(CPPFLAGS) -I$(INC) mmfind.c $(LIBOBJECTS) $(OBJECTS) mmpm2.lib rexx.lib mmfind.def
         rc mmfind.rc mmfind.exe
 

trunk/classes/mm-progs/mmfind/mmfind.c

@@ -46 +46 @@
 #include <string.h>
 #include <stdlib.h>
+#include <rexxsaa.h> 
 #include "os2me.h"
 /* CW toolkit includes */

trunk/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         = 
@@ -21 +22 @@
 
 $(LIBDIR)/%.obj:        $(COMMONSRC)/%.c 
-        gcc -c -Wall -o$@ -Zomf -I$(INC) $<  
-
+#       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:

trunk/classes/mm-progs/volume/makefile

@@ -17 +17 @@
         cmd /C $(TOOLDIR)\create_MMPROG_def.cmd classvolume.def
 #Use this command to link dynamicaly
-        $(CC) $(CPPFLAGS) -I$(INC) classvol.c $(OBJECTS) $(OBJS2) -lmmpm2.lib classvolume.def
+        $(CC) $(CPPFLAGS) -I$(INC) classvol.c $(OBJECTS) $(OBJS2) mmpm2.lib classvolume.def
         rc classvolume.rc classvol.exe
 
@@ -28 +28 @@
         -rm *.res
         -rm *.ini
+        -rm $(LIBDIR)/*.obj
 
 cleaner:

trunk/common_functions/helper.c

@@ -103 +103 @@
 BOOL buildLogName( char * outBuf, char * logName,ULONG ulSize)
 {
-  if(snprintf(outBuf, ulSize,"logfiles\\%s",logName)==EOF)
+  if(sprintf(outBuf, /*ulSize,*/"logfiles\\%s",logName)==EOF)
     return FALSE;
   return TRUE;
@@ -518 +518 @@
 {
   /* Build full path for cdrecord.ini file */
-  snprintf(chrBuffer, iBufferSize, "%s\\cdrecord.ini", chrInstallDir);
+  sprintf(chrBuffer, /*iBufferSize,*/ "%s\\cdrecord.ini", chrInstallDir);
   chrBuffer[iBufferSize-1]=0; /* Always terminate with zero */
 }