diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..4fdf806 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,685 @@ +# CMakeList.txt : CMake project for Red Alert +cmake_minimum_required (VERSION 3.8) + +project(RedAlert ASM CXX C) +enable_language(ASM) +set(CMAKE_CXX_FLAGS "") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../) +set(CMAKE_VERBOSE_MAKEFILE ON) + +set(src_win32lib + ./RedAlert/WIN32LIB/ALLOC.CPP + ./RedAlert/WIN32LIB/AUDIO.H + ./RedAlert/WIN32LIB/BUFFER.CPP + ./RedAlert/WIN32LIB/BUFFER.H + ./RedAlert/WIN32LIB/BUFFGLBL.CPP + ./RedAlert/WIN32LIB/DDRAW.CPP + ./RedAlert/WIN32LIB/DDRAW.H + ./RedAlert/WIN32LIB/DEFINES.H + ./RedAlert/WIN32LIB/DELAY.CPP + ./RedAlert/WIN32LIB/DESCMGMT.H + ./RedAlert/WIN32LIB/DIFFTB.INC + ./RedAlert/WIN32LIB/DIPTHONG.CPP + ./RedAlert/WIN32LIB/DIPTHONG.H + ./RedAlert/WIN32LIB/DPLAY.H + ./RedAlert/WIN32LIB/DRAWBUFF.H + ./RedAlert/WIN32LIB/DRAWBUFF.INC + ./RedAlert/WIN32LIB/DrawMisc.cpp + ./RedAlert/WIN32LIB/DRAWRECT.CPP + ./RedAlert/WIN32LIB/DSETUP.H + ./RedAlert/WIN32LIB/DSOUND.H + ./RedAlert/WIN32LIB/EXTERNS.H + ./RedAlert/WIN32LIB/FASTFILE.H + ./RedAlert/WIN32LIB/FILE.H + ./RedAlert/WIN32LIB/FILEPCX.H + ./RedAlert/WIN32LIB/FILETEMP.H + ./RedAlert/WIN32LIB/FONT.CPP + ./RedAlert/WIN32LIB/FONT.H + ./RedAlert/WIN32LIB/FUNCTION.H + ./RedAlert/WIN32LIB/GBUFFER.CPP + ./RedAlert/WIN32LIB/GBUFFER.H + ./RedAlert/WIN32LIB/GBUFFER.INC + ./RedAlert/WIN32LIB/GETSHAPE.CPP + ./RedAlert/WIN32LIB/ICONCACH.H + ./RedAlert/WIN32LIB/ICONSET.CPP + ./RedAlert/WIN32LIB/IFF.CPP + ./RedAlert/WIN32LIB/IFF.H + ./RedAlert/WIN32LIB/INDEXTB.INC + ./RedAlert/WIN32LIB/IRANDOM.CPP + ./RedAlert/WIN32LIB/KEYBOARD.H + ./RedAlert/WIN32LIB/KEYBOARD.INC + ./RedAlert/WIN32LIB/KEYSTRUC.INC + ./RedAlert/WIN32LIB/LOAD.CPP + ./RedAlert/WIN32LIB/LOADFONT.CPP + ./RedAlert/WIN32LIB/MCGAPRIM.INC + ./RedAlert/WIN32LIB/MEMFLAG.H + ./RedAlert/WIN32LIB/MISC.H + ./RedAlert/WIN32LIB/MODEMREG.H + ./RedAlert/WIN32LIB/MONO.H + ./RedAlert/WIN32LIB/MOUSE.H + ./RedAlert/WIN32LIB/MOUSE.INC + ./RedAlert/WIN32LIB/MouseShape.cpp + ./RedAlert/WIN32LIB/MouseShape.h + ./RedAlert/WIN32LIB/MOUSEWW.CPP + ./RedAlert/WIN32LIB/NYBBTB.INC + ./RedAlert/WIN32LIB/PALETTE.CPP + ./RedAlert/WIN32LIB/PALETTE.H + ./RedAlert/WIN32LIB/PLAYCD.H + ./RedAlert/WIN32LIB/PROFILE.H + ./RedAlert/WIN32LIB/PROFILE.INC + ./RedAlert/WIN32LIB/RAWFILE.H + ./RedAlert/WIN32LIB/SET_FONT.CPP + ./RedAlert/WIN32LIB/SHAPE.H + ./RedAlert/WIN32LIB/SHAPE.INC + ./RedAlert/WIN32LIB/SOS.H + ./RedAlert/WIN32LIB/SOSCOMP.H + ./RedAlert/WIN32LIB/SOSDATA.H + ./RedAlert/WIN32LIB/SOSDEFS.H + ./RedAlert/WIN32LIB/SOSFNCT.H + ./RedAlert/WIN32LIB/SOSRES.H + ./RedAlert/WIN32LIB/SOUND.H + ./RedAlert/WIN32LIB/SOUNDINT.H + ./RedAlert/WIN32LIB/STAMP.INC + ./RedAlert/WIN32LIB/STRUCTS.H + ./RedAlert/WIN32LIB/SVGAPRIM.INC + ./RedAlert/WIN32LIB/TILE.H + ./RedAlert/WIN32LIB/TIMER.CPP + ./RedAlert/WIN32LIB/TIMER.H + ./RedAlert/WIN32LIB/TIMERDWN.CPP + ./RedAlert/WIN32LIB/TIMERINI.CPP + ./RedAlert/WIN32LIB/VIDEO.H + ./RedAlert/WIN32LIB/WINCOMM.H + ./RedAlert/WIN32LIB/WINDOWS.CPP + ./RedAlert/WIN32LIB/WINHIDE.CPP + ./RedAlert/WIN32LIB/WRITEPCX.CPP + ./RedAlert/WIN32LIB/WSA.CPP + ./RedAlert/WIN32LIB/WSA.H + ./RedAlert/WIN32LIB/WWFILE.H + ./RedAlert/WIN32LIB/WWLIB32.H + ./RedAlert/WIN32LIB/WWMEM.H + ./RedAlert/WIN32LIB/WWMEM.INC + ./RedAlert/WIN32LIB/wwstd.h + ./RedAlert/WIN32LIB/WW_WIN.H + ./RedAlert/WIN32LIB/_DIPTABL.CPP +) + +#Red Alert files +set(src_redalert + ./RedAlert/2KEYFRAM.CPP + ./RedAlert/AADATA.CPP + ./RedAlert/ABSTRACT.CPP + ./RedAlert/ABSTRACT.H + ./RedAlert/ADATA.CPP + ./RedAlert/ADPCM.CPP + ./RedAlert/AIRCRAFT.CPP + ./RedAlert/AIRCRAFT.H + ./RedAlert/ANIM.CPP + ./RedAlert/ANIM.H + ./RedAlert/AUDIO.CPP + ./RedAlert/AUDIO.H + ./RedAlert/AUDIOMIX.H + ./RedAlert/AUDMIX.CPP + ./RedAlert/B64PIPE.CPP + ./RedAlert/B64PIPE.H + ./RedAlert/B64STRAW.CPP + ./RedAlert/B64STRAW.H + ./RedAlert/BAR.CPP + ./RedAlert/BAR.H + ./RedAlert/BASE.CPP + ./RedAlert/BASE.H + ./RedAlert/BASE64.CPP + ./RedAlert/BASE64.H + ./RedAlert/BBDATA.CPP + ./RedAlert/BDATA.CPP + ./RedAlert/BENCH.CPP + ./RedAlert/BENCH.H + ./RedAlert/BFIOFILE.CPP + ./RedAlert/BFIOFILE.H + ./RedAlert/BIGCHECK.CPP + ./RedAlert/BIGCHECK.H + ./RedAlert/BLOWFISH.CPP + ./RedAlert/BLOWFISH.H + ./RedAlert/BLOWPIPE.CPP + ./RedAlert/BLOWPIPE.H + ./RedAlert/BLWSTRAW.CPP + ./RedAlert/BLWSTRAW.H + ./RedAlert/BUFF.CPP + ./RedAlert/BUFF.H + ./RedAlert/BUFFERX.H + ./RedAlert/BUILDING.CPP + ./RedAlert/BUILDING.H + ./RedAlert/BULLET.CPP + ./RedAlert/BULLET.H + ./RedAlert/CARGO.CPP + ./RedAlert/CARGO.H + ./RedAlert/CARRY.CPP + ./RedAlert/CARRY.H + ./RedAlert/CBN_.H + ./RedAlert/CCDDE.CPP + ./RedAlert/CCDDE.H + ./RedAlert/CCFILE.CPP + ./RedAlert/CCFILE.H + ./RedAlert/CCINI.CPP + ./RedAlert/CCINI.H + ./RedAlert/CCMPATH.CPP + ./RedAlert/CCPTR.CPP + ./RedAlert/CCPTR.H + ./RedAlert/CCTEN.CPP + ./RedAlert/CDATA.CPP + ./RedAlert/CDFILE.CPP + ./RedAlert/CDFILE.H + ./RedAlert/CELL.CPP + ./RedAlert/CELL.H + ./RedAlert/CHECKBOX.CPP + ./RedAlert/CHECKBOX.H + ./RedAlert/CHEKLIST.CPP + ./RedAlert/CHEKLIST.H + ./RedAlert/CLASS.CPP + ./RedAlert/COLRLIST.CPP + ./RedAlert/COLRLIST.H + ./RedAlert/COMBAT.CPP + ./RedAlert/COMBUF.CPP + ./RedAlert/COMBUF.H + ./RedAlert/COMINIT.CPP + ./RedAlert/COMINIT.H + ./RedAlert/COMPAT.H + ./RedAlert/COMQUEUE.CPP + ./RedAlert/COMQUEUE.H + ./RedAlert/CONFDLG.CPP + ./RedAlert/CONFDLG.H + ./RedAlert/CONNECT.CPP + ./RedAlert/CONNECT.H + ./RedAlert/CONNMGR.H + ./RedAlert/CONQUER.CPP + ./RedAlert/CONQUER.H + ./RedAlert/CONST.CPP + ./RedAlert/CONTROL.CPP + ./RedAlert/CONTROL.H + ./RedAlert/COORD.CPP + ./RedAlert/COORDA.h + ./RedAlert/CRATE.CPP + ./RedAlert/CRATE.H + ./RedAlert/CRC.CPP + ./RedAlert/CRC.H + ./RedAlert/CRCPIPE.CPP + ./RedAlert/CRCPIPE.H + ./RedAlert/CRCSTRAW.CPP + ./RedAlert/CRCSTRAW.H + ./RedAlert/CREDITS.CPP + ./RedAlert/CREDITS.H + ./RedAlert/CREW.CPP + ./RedAlert/CREW.H + ./RedAlert/CSTRAW.CPP + ./RedAlert/CSTRAW.H + ./RedAlert/DDE.CPP + ./RedAlert/DDE.H + ./RedAlert/DEBUG.CPP + ./RedAlert/DEBUG.H + ./RedAlert/decompiled.h + ./RedAlert/DEFINES.H + ./RedAlert/DESCDLG.CPP + ./RedAlert/DESCDLG.H + ./RedAlert/DIAL8.CPP + ./RedAlert/DIAL8.H + ./RedAlert/DIALOG.CPP + ./RedAlert/DIBAPI.H + ./RedAlert/DIBFILE.CPP + ./RedAlert/DIBUTIL.CPP + ./RedAlert/DIBUTIL.H + ./RedAlert/DISPLAY.CPP + ./RedAlert/DISPLAY.H + ./RedAlert/DLLInterface.cpp + ./RedAlert/DLLInterface.h + ./RedAlert/DLLInterfaceEditor.cpp + ./RedAlert/DOOR.CPP + ./RedAlert/DOOR.H + ./RedAlert/DPMI.CPP + ./RedAlert/DPMI.H + ./RedAlert/DRIVE.CPP + ./RedAlert/DRIVE.H + ./RedAlert/DROP.CPP + ./RedAlert/DROP.H + ./RedAlert/DTABLE.CPP + ./RedAlert/DYNAVEC.CPP + ./RedAlert/EDIT.CPP + ./RedAlert/EDIT.H + ./RedAlert/EGOS.CPP + ./RedAlert/EGOS.H + ./RedAlert/ENDING.CPP + ./RedAlert/ENDING.H + ./RedAlert/EVENT.CPP + ./RedAlert/EVENT.H + ./RedAlert/EXPAND.CPP + ./RedAlert/EXTERNS.H + ./RedAlert/FACE.CPP + ./RedAlert/FACE.H + ./RedAlert/FACING.CPP + ./RedAlert/FACING.H + ./RedAlert/FACTORY.CPP + ./RedAlert/FACTORY.H + ./RedAlert/FAKESOCK.H + ./RedAlert/FIELD.CPP + ./RedAlert/FIELD.H + ./RedAlert/FILEPCX.H + ./RedAlert/FINDPATH.CPP + ./RedAlert/FIXED.CPP + ./RedAlert/FIXED.H + ./RedAlert/FLASHER.CPP + ./RedAlert/FLASHER.H + ./RedAlert/FLY.CPP + ./RedAlert/FLY.H + ./RedAlert/FOOT.CPP + ./RedAlert/FOOT.H + ./RedAlert/FTIMER.H + ./RedAlert/FUNCTION.H + ./RedAlert/FUSE.CPP + ./RedAlert/FUSE.H + ./RedAlert/GADGET.CPP + ./RedAlert/GADGET.H + ./RedAlert/GAMEDLG.CPP + ./RedAlert/GAMEDLG.H + ./RedAlert/GAUGE.CPP + ./RedAlert/GAUGE.H + ./RedAlert/GETCPU.CPP + ./RedAlert/GLOBALS.CPP + ./RedAlert/GOPTIONS.CPP + ./RedAlert/GOPTIONS.H + ./RedAlert/GSCREEN.CPP + ./RedAlert/GSCREEN.H + ./RedAlert/HDATA.CPP + ./RedAlert/HEAP.CPP + ./RedAlert/HEAP.H + ./RedAlert/HELP.CPP + ./RedAlert/HELP.H + ./RedAlert/HOUSE.CPP + ./RedAlert/HOUSE.H + ./RedAlert/HSV.CPP + ./RedAlert/HSV.H + ./RedAlert/ICONLIST.CPP + ./RedAlert/ICONLIST.H + ./RedAlert/IDATA.CPP + ./RedAlert/INFANTRY.CPP + ./RedAlert/INFANTRY.H + ./RedAlert/INI.CPP + ./RedAlert/INI.H + ./RedAlert/INIBIN.CPP + ./RedAlert/INICODE.CPP + ./RedAlert/INIT.CPP + ./RedAlert/INLINE.H + ./RedAlert/INT.CPP + ./RedAlert/INT.H + ./RedAlert/INTERNET.CPP + ./RedAlert/INTERNET.H + ./RedAlert/INTERPAL.CPP + ./RedAlert/INTRO.CPP + ./RedAlert/INTRO.H + ./RedAlert/IOMAP.CPP + ./RedAlert/IOOBJ.CPP + ./RedAlert/IPX.CPP + ./RedAlert/IPX.H + ./RedAlert/IPX95.CPP + ./RedAlert/IPX95.H + ./RedAlert/IPXADDR.CPP + ./RedAlert/IPXADDR.H + ./RedAlert/IPXCONN.CPP + ./RedAlert/IPXCONN.H + ./RedAlert/IPXGCONN.CPP + ./RedAlert/IPXGCONN.H + ./RedAlert/IPXMGR.CPP + ./RedAlert/IPXMGR.H + ./RedAlert/ITABLE.CPP + ./RedAlert/JSHELL.CPP + ./RedAlert/JSHELL.H + ./RedAlert/KEY.CPP + ./RedAlert/KEY.H + ./RedAlert/KEYBOARD.H + ./RedAlert/LANGUAGE.H + ./RedAlert/LAYER.CPP + ./RedAlert/LAYER.H + ./RedAlert/LCW.CPP + ./RedAlert/LCW.H + ./RedAlert/LCWPIPE.CPP + ./RedAlert/LCWPIPE.H + ./RedAlert/LCWSTRAW.CPP + ./RedAlert/LCWSTRAW.H + ./RedAlert/LCWUNCMP.CPP + ./RedAlert/LED.H + ./RedAlert/License.txt + ./RedAlert/LINK.CPP + ./RedAlert/LINK.H + ./RedAlert/LINT.H + ./RedAlert/LIST.CPP + ./RedAlert/LIST.H + ./RedAlert/LISTNODE.H + ./RedAlert/LOADDLG.CPP + ./RedAlert/LOADDLG.H + ./RedAlert/LOGIC.CPP + ./RedAlert/LOGIC.H + ./RedAlert/LZO.H + ./RedAlert/LZO1X.H + ./RedAlert/LZO1X_C.CPP + ./RedAlert/LZO1X_D.CPP + ./RedAlert/LZOCONF.H + ./RedAlert/LZOPIPE.CPP + ./RedAlert/LZOPIPE.H + ./RedAlert/LZOSTRAW.CPP + ./RedAlert/LZOSTRAW.H + ./RedAlert/LZO_CONF.H + ./RedAlert/LZW.CPP + ./RedAlert/LZW.H + ./RedAlert/LZWPIPE.CPP + ./RedAlert/LZWPIPE.H + ./RedAlert/LZWSTRAW.CPP + ./RedAlert/LZWSTRAW.H + ./RedAlert/MAP.CPP + ./RedAlert/MAP.H + ./RedAlert/MAPEDDLG.CPP + ./RedAlert/MAPEDIT.CPP + ./RedAlert/MAPEDIT.H + ./RedAlert/MAPEDPLC.CPP + ./RedAlert/MAPEDTM.CPP + ./RedAlert/MAPSEL.CPP + ./RedAlert/MCI.CPP + ./RedAlert/MCI.H + ./RedAlert/MCIMOVIE.CPP + ./RedAlert/MCIMOVIE.H + ./RedAlert/MEMCHECK.H + ./RedAlert/MENUS.CPP + ./RedAlert/MESSAGE.H + ./RedAlert/MiscAsm.cpp + ./RedAlert/MISSION.CPP + ./RedAlert/MISSION.H + ./RedAlert/MIXFILE.CPP + ./RedAlert/MIXFILE.H + ./RedAlert/MONOC.CPP + ./RedAlert/MONOC.H + ./RedAlert/MOUSE.CPP + ./RedAlert/MOUSE.H + ./RedAlert/MOVIE.H + ./RedAlert/MP.CPP + ./RedAlert/MP.H + ./RedAlert/MPGSET.CPP + ./RedAlert/MPGSET.H + ./RedAlert/MPLAYER.CPP + ./RedAlert/MPMGRW.CPP + ./RedAlert/MPMGRW.H + ./RedAlert/MPU.CPP + ./RedAlert/MPU.H + ./RedAlert/MSGBOX.CPP + ./RedAlert/MSGBOX.H + ./RedAlert/MSGLIST.CPP + ./RedAlert/MSGLIST.H + ./RedAlert/NETDLG.CPP + ./RedAlert/NULLCONN.CPP + ./RedAlert/NULLCONN.H + ./RedAlert/NULLDLG.CPP + ./RedAlert/NULLMGR.CPP + ./RedAlert/NULLMGR.H + ./RedAlert/OBJECT.CPP + ./RedAlert/OBJECT.H + ./RedAlert/OCIDL.H + ./RedAlert/ODATA.CPP + ./RedAlert/OPTIONS.CPP + ./RedAlert/OPTIONS.H + ./RedAlert/OVERLAY.CPP + ./RedAlert/OVERLAY.H + ./RedAlert/PACKET.CPP + ./RedAlert/PACKET.H + ./RedAlert/PALETTEC.CPP + ./RedAlert/PALETTEC.H + ./RedAlert/PIPE.CPP + ./RedAlert/PIPE.H + ./RedAlert/PK.CPP + ./RedAlert/PK.H + ./RedAlert/PKPIPE.CPP + ./RedAlert/PKPIPE.H + ./RedAlert/PKSTRAW.CPP + ./RedAlert/PKSTRAW.H + ./RedAlert/POWER.CPP + ./RedAlert/POWER.H + ./RedAlert/PROFILE.CPP + ./RedAlert/QUEUE.CPP + ./RedAlert/QUEUE.H + ./RedAlert/RADAR.CPP + ./RedAlert/RADAR.H + ./RedAlert/RADIO.CPP + ./RedAlert/RADIO.H + ./RedAlert/RAMFILE.CPP + ./RedAlert/RAMFILE.H + ./RedAlert/RAND.CPP + ./RedAlert/RANDOM.CPP + ./RedAlert/RANDOM.H + ./RedAlert/RAWFILE.CPP + ./RedAlert/RAWFILE.H + ./RedAlert/RAWOLAPI.CPP + ./RedAlert/RAWOLAPI.H + ./RedAlert/READLINE.CPP + ./RedAlert/READLINE.H + ./RedAlert/RECT.CPP + ./RedAlert/RECT.H + ./RedAlert/REGION.H + ./RedAlert/REINF.CPP + ./RedAlert/RGB.CPP + ./RedAlert/RGB.H + ./RedAlert/RNDSTRAW.CPP + ./RedAlert/RNDSTRAW.H + ./RedAlert/RNG.H + ./RedAlert/ROTBMP.CPP + ./RedAlert/ROTBMP.H + ./RedAlert/RULES.CPP + ./RedAlert/RULES.H + ./RedAlert/SAVEDLG.H + ./RedAlert/SAVELOAD.CPP + ./RedAlert/SCENARIO.CPP + ./RedAlert/SCENARIO.H + ./RedAlert/SCORE.CPP + ./RedAlert/SCORE.H + ./RedAlert/SCREEN.H + ./RedAlert/SCROLL.CPP + ./RedAlert/SCROLL.H + ./RedAlert/SDATA.CPP + ./RedAlert/SEARCH.H + ./RedAlert/SEDITDLG.CPP + ./RedAlert/SEDITDLG.H + ./RedAlert/SENDFILE.CPP + ./RedAlert/SEQCONN.CPP + ./RedAlert/SEQCONN.H + ./RedAlert/SESSION.CPP + ./RedAlert/SESSION.H + ./RedAlert/SHA.CPP + ./RedAlert/SHA.H + ./RedAlert/Shape.cpp + ./RedAlert/SHAPEBTN.CPP + ./RedAlert/SHAPEBTN.H + ./RedAlert/SHAPIPE.CPP + ./RedAlert/SHAPIPE.H + ./RedAlert/SHASTRAW.CPP + ./RedAlert/SHASTRAW.H + ./RedAlert/SIDEBAR.CPP + ./RedAlert/SIDEBAR.H + ./RedAlert/SIDEBARGlyphx.CPP + ./RedAlert/SIDEBARGlyphx.H + ./RedAlert/SLIDER.CPP + ./RedAlert/SLIDER.H + ./RedAlert/SMUDGE.CPP + ./RedAlert/SMUDGE.H + ./RedAlert/SOUNDDLG.CPP + ./RedAlert/SOUNDDLG.H + ./RedAlert/SPECIAL.CPP + ./RedAlert/SPECIAL.H + ./RedAlert/SPRITE.CPP + ./RedAlert/STAGE.H + ./RedAlert/STARTUP.CPP + ./RedAlert/STATBTN.CPP + ./RedAlert/STATBTN.H + ./RedAlert/STATS.CPP + ./RedAlert/STRAW.CPP + ./RedAlert/STRAW.H + ./RedAlert/STUB.CPP + ./RedAlert/STYLE.H + ./RedAlert/SUPER.CPP + ./RedAlert/SUPER.H + ./RedAlert/SURFACE.CPP + ./RedAlert/SURFACE.H + ./RedAlert/TAB.CPP + ./RedAlert/TAB.H + ./RedAlert/TACTION.CPP + ./RedAlert/TACTION.H + ./RedAlert/TARGET.CPP + ./RedAlert/TARGET.H + ./RedAlert/TCPIP.CPP + ./RedAlert/TCPIP.H + ./RedAlert/TDATA.CPP + ./RedAlert/TEAM.CPP + ./RedAlert/TEAM.H + ./RedAlert/TEAMTYPE.CPP + ./RedAlert/TEAMTYPE.H + ./RedAlert/TECHNO.CPP + ./RedAlert/TECHNO.H + ./RedAlert/TEMPLATE.CPP + ./RedAlert/TEMPLATE.H + ./RedAlert/TENMGR.CPP + ./RedAlert/TENMGR.H + ./RedAlert/TERRAIN.CPP + ./RedAlert/TERRAIN.H + ./RedAlert/TEVENT.CPP + ./RedAlert/TEVENT.H + ./RedAlert/TEXTBTN.CPP + ./RedAlert/TEXTBTN.H + ./RedAlert/THEME.CPP + ./RedAlert/THEME.H + ./RedAlert/TOGGLE.CPP + ./RedAlert/TOGGLE.H + ./RedAlert/TOOLTIP.CPP + ./RedAlert/TOOLTIP.H + ./RedAlert/TRACKER.CPP + ./RedAlert/TRIGGER.CPP + ./RedAlert/TRIGGER.H + ./RedAlert/TRIGTYPE.CPP + ./RedAlert/TRIGTYPE.H + ./RedAlert/TXTLABEL.CPP + ./RedAlert/TXTLABEL.H + ./RedAlert/TYPE.H + ./RedAlert/UDATA.CPP + ./RedAlert/UDPADDR.CPP + ./RedAlert/UNIT.CPP + ./RedAlert/UNIT.H + ./RedAlert/UTRACKER.CPP + ./RedAlert/UTRACKER.H + ./RedAlert/VDATA.CPP + ./RedAlert/VECTOR.CPP + ./RedAlert/VECTOR.H + ./RedAlert/VERSION.CPP + ./RedAlert/VERSION.H + ./RedAlert/VESSEL.CPP + ./RedAlert/VESSEL.H + ./RedAlert/VISUDLG.CPP + ./RedAlert/VISUDLG.H + ./RedAlert/VORTEX.CPP + ./RedAlert/VORTEX.H + ./RedAlert/VQAMOVIE.CPP + ./RedAlert/VQAMOVIE.H + ./RedAlert/W95TRACE.CPP + ./RedAlert/W95TRACE.H + ./RedAlert/WARHEAD.CPP + ./RedAlert/WARHEAD.H + ./RedAlert/WATCOM.H + ./RedAlert/WEAPON.CPP + ./RedAlert/WEAPON.H + ./RedAlert/WINSTUB.CPP + ./RedAlert/WOLAPIOB.CPP + ./RedAlert/WOLAPIOB.H + ./RedAlert/WOLDEBUG.H + ./RedAlert/WOLEDIT.CPP + ./RedAlert/WOLEDIT.H + ./RedAlert/WOLSTRNG.CPP + ./RedAlert/WOLSTRNG.H + ./RedAlert/WOL_CGAM.CPP + ./RedAlert/WOL_CHAT.CPP + ./RedAlert/WOL_DNLD.CPP + ./RedAlert/WOL_GSUP.CPP + ./RedAlert/WOL_GSUP.H + ./RedAlert/WOL_LOGN.CPP + ./RedAlert/WOL_MAIN.CPP + ./RedAlert/WOL_OPT.CPP + ./RedAlert/WSNWLINK.H + ./RedAlert/WSPIPX.CPP + ./RedAlert/WSPIPX.H + ./RedAlert/WSPROTO.CPP + ./RedAlert/WSPROTO.H + ./RedAlert/WSPUDP.CPP + ./RedAlert/WSPUDP.H + ./RedAlert/WWALLOC.H + ./RedAlert/WWFILE.H + ./RedAlert/XPIPE.CPP + ./RedAlert/XPIPE.H + ./RedAlert/XSTRAW.CPP + ./RedAlert/XSTRAW.H + ./RedAlert/_WSPROTO.CPP + ./RedAlert/_WSPROTO.H +) + +set(src_external + #Direct Draw Wrapper + ./ddraw/ddrawwrapper/ddraw2.cpp + ./ddraw/ddrawwrapper/DirectDrawClipperWrapper.cpp + ./ddraw/ddrawwrapper/DirectDrawPaletteWrapper.cpp + ./ddraw/ddrawwrapper/DirectDrawSurfaceWrapper.cpp + ./ddraw/ddrawwrapper/DirectDrawWrapper.cpp + ./ddraw/ddrawwrapper/DirectDrawWrapper.h + + #libsmacker + ./external/libsmacker/smacker.c + ./external/libsmacker/smacker.h + ./external/libsmacker/smk_bitstream.c + ./external/libsmacker/smk_bitstream.h + ./external/libsmacker/smk_hufftree.c + ./external/libsmacker/smk_hufftree.h + ./external/libsmacker/smk_malloc.h + + #imgui + ./external/imgui/imconfig.h + ./external/imgui/imgui.cpp + ./external/imgui/imgui.h + ./external/imgui/imgui_draw.cpp + ./external/imgui/imgui_widgets.cpp + ./external/imgui/examples/imgui_impl_dx9.cpp + ./external/imgui/examples/imgui_impl_dx9.h + ./external/imgui/examples/imgui_impl_sdl.cpp + ./external/imgui/examples/imgui_impl_sdl.h +) + +ADD_CUSTOM_COMMAND(OUTPUT TOBUFF.obj + COMMAND ml -c + ${CMAKE_CURRENT_SOURCE_DIR}/RedAlert/WIN32LIB/TOBUFF.ASM + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/RedAlert/WIN32LIB/TOBUFF.ASM + COMMENT "generate TOBUFF.obj") + +ADD_CUSTOM_COMMAND(OUTPUT TXTPRNT.obj + COMMAND ml -c + ${CMAKE_CURRENT_SOURCE_DIR}/RedAlert/TXTPRNT.ASM + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/RedAlert/TXTPRNT.ASM + COMMENT "generate TXTPRNT.obj") + +ADD_CUSTOM_COMMAND(OUTPUT KEYFBUFF.obj + COMMAND ml.exe /c /nolog /Zi /Zm /Cx + ${CMAKE_CURRENT_SOURCE_DIR}/RedAlert/KEYFBUFF.ASM /Fl"" /Cp /W3 /errorReport:prompt + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/RedAlert/KEYFBUFF.ASM + COMMENT "generate KEYFBUFF.obj") + +ADD_CUSTOM_COMMAND(OUTPUT MMX.obj + COMMAND ml.exe /c /nolog /Zi + ${CMAKE_CURRENT_SOURCE_DIR}/RedAlert/MMX.ASM /Fl"" /Cp /W3 /errorReport:prompt + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/RedAlert/MMX.ASM + COMMENT "generate MMX.obj") + +add_definitions(-DCHEAT_KEYS -DSCENARIO_EDITOR -DWINDOWS_IGNORE_PACKING_MISMATCH -DTRUE_FALSE_DEFINED -DWIN32 -DWINDOWS -DENGLISH -D_USRDLL -DREDALERT_EXPORTS) +add_compile_options(/permissive+ /Zc:forScope- /Zp1) +add_executable(RedAlert ${src_win32lib} ${src_redalert} ${src_external} TOBUFF.obj KEYFBUFF.obj TXTPRNT.obj MMX.obj ) + + + +set_target_properties(RedAlert PROPERTIES OUTPUT_NAME "RedAlert" LINK_FLAGS "/PDB:\"RedAlert.pdb\" /SUBSYSTEM:WINDOWS") +target_include_directories(RedAlert PRIVATE ./redalert/win32lib ./external/imgui;./external/dxsdk/Include;./external/ffmpeg-win32/include;./external/sdl2/include;./win32lib;./external/openal/include) +target_link_libraries(RedAlert "d3d9.lib" "winmm.lib" "Ws2_32.lib" "${CMAKE_SOURCE_DIR}/external/dxsdk/Lib/x86/d3dx9.lib" "${CMAKE_SOURCE_DIR}/external/sdl2/lib/x86/SDL2.lib" "${CMAKE_SOURCE_DIR}/external/openal/out/build/x86-Release/OpenAL32.lib") diff --git a/CMakeSettings.json b/CMakeSettings.json new file mode 100644 index 0000000..c0cb4d9 --- /dev/null +++ b/CMakeSettings.json @@ -0,0 +1,16 @@ +{ + "configurations": [ + { + "name": "x86-Debug", + "generator": "Ninja", + "configurationType": "Debug", + "buildRoot": "${projectDir}\\out\\build\\${name}", + "installRoot": "${projectDir}\\out\\install\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "", + "ctestCommandArgs": "", + "inheritEnvironments": [ "msvc_x86" ], + "variables": [] + } + ] +} \ No newline at end of file diff --git a/CnCRemastered.sln b/CnCRemastered.sln deleted file mode 100644 index 2073d15..0000000 --- a/CnCRemastered.sln +++ /dev/null @@ -1,26 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30114.105 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RedAlert", "REDALERT\RedAlert.vcxproj", "{DA948ED9-EF67-4813-94B7-995BE956786E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2578A28E-5B23-40C3-9E90-B3652E8ADB24}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x86 = Debug|x86 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DA948ED9-EF67-4813-94B7-995BE956786E}.Debug|x86.ActiveCfg = Debug|Win32 - {DA948ED9-EF67-4813-94B7-995BE956786E}.Debug|x86.Build.0 = Debug|Win32 - {DA948ED9-EF67-4813-94B7-995BE956786E}.Release|x86.ActiveCfg = Debug|Win32 - {DA948ED9-EF67-4813-94B7-995BE956786E}.Release|x86.Build.0 = Debug|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {712D2733-25EE-407D-AEF8-B2342757E119} - EndGlobalSection -EndGlobal diff --git a/REDALERT/KEYFBUFF.ASM b/REDALERT/KEYFBUFF.ASM index d6c3007..002a2bf 100644 --- a/REDALERT/KEYFBUFF.ASM +++ b/REDALERT/KEYFBUFF.ASM @@ -297,7 +297,7 @@ externdef CriticalFadeRedirections:dword externdef C Single_Line_Trans:near externdef C Single_Line_Trans_Entry:near -externdef C Next_Line:near +;externdef C Next_Line:near .CODE diff --git a/REDALERT/MMX.ASM b/REDALERT/MMX.ASM index b349ca1..5294429 100644 --- a/REDALERT/MMX.ASM +++ b/REDALERT/MMX.ASM @@ -278,40 +278,10 @@ MMX_Single_Line_Trans proc near ; ; If we are doing less than 8 bytes then dont use MMX ; - cmp ecx,8 - jge @@mmx_loop push offset Single_Line_Trans_Entry ret -; -; Use MMX instructions to mask 8 bytes at once -; -; Creates a bitmask based on the source bytes equality with zero and then uses this to mask -; out the source bytes in the destination data. The advatage that MMX gives us is that there is -; no 'test for zero then jump' required to mask. -; - align 64 ;MMX instructions like 64 byte alignment! -@@mmx_loop: - movq mm0,[esi] ; move 8 bytes of source into mm0 - pxor mm1,mm1 ; zero out mm1 - pcmpeqb mm1,mm0 ; compare mm0 with 0. Bits get set in mm1 - lea esi,[esi+8] ; adjust the source data pointer - pand mm1,[edi] ; and in the destination data to throw away the bytes which arent zero in the source - sub ecx,8 ; adjust the byte counter - por mm1,mm0 ; or in the source with the destination data - movq [edi],mm1 ; write back the destination data - lea edi,[edi+8] ; adjust the destination pointer - - cmp ecx,8 - jg @@mmx_loop - -; -; Jump to the approprite code for drawing the end of this line or going to the next one -; - push offset Next_Line - jcxz @@next_line - push offset Single_Line_Trans_Entry @@next_line: ret diff --git a/REDALERT/RedAlert.vcxproj b/REDALERT/RedAlert.vcxproj deleted file mode 100644 index 0669290..0000000 --- a/REDALERT/RedAlert.vcxproj +++ /dev/null @@ -1,837 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {DA948ED9-EF67-4813-94B7-995BE956786E} - RedAlert - 10.0 - SAK - SAK - SAK - SAK - - - - Application - true - v142 - MultiByte - - - Application - false - v142 - true - MultiByte - - - Application - true - v142 - MultiByte - - - Application - false - v142 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - - ..\bin\$(PlatformName)\ - $(PlatformName)\$(Configuration)\ - false - - - false - ..\bin\$(PlatformName)\ - $(PlatformName)\$(Configuration)\ - $(ProjectName)I - - - - Level3 - MaxSpeed - true - true - false - ../external/imgui;../external/dxsdk/Include;../external/ffmpeg-win32/include;../external/sdl2/include;./win32lib;../external/openal/include - true - false - CHEAT_KEYS;SCENARIO_EDITOR;WINDOWS_IGNORE_PACKING_MISMATCH;TRUE_FALSE_DEFINED;ENGLISH;WIN32;NDEBUG;_WINDOWS;_USRDLL;REDALERT_EXPORTS;%(PreprocessorDefinitions) - 1Byte - false - MultiThreaded - 4800;4244;4996 - false - false - false - - - true - true - d3d9.lib;winmm.lib;Ws2_32.lib;%(AdditionalDependencies) - DebugFull - Windows - false - false - false - ../../RedAlert.exe - - - - - Level3 - Disabled - false - ../external/imgui;../external/dxsdk/Include;../external/ffmpeg-win32/include;../external/sdl2/include;./win32lib;../external/openal/include - false - true - ProgramDatabase - CHEAT_KEYS;SCENARIO_EDITOR;WINDOWS_IGNORE_PACKING_MISMATCH;TRUE_FALSE_DEFINED;ENGLISH;WIN32;_DEBUG;_WINDOWS;_USRDLL;REDALERT_EXPORTS;%(PreprocessorDefinitions) - false - MultiThreadedDebug - 1Byte - 4800;4244;4996 - false - false - - - d3d9.lib;winmm.lib;Ws2_32.lib;%(AdditionalDependencies) - DebugFull - Windows - $(OutDir)$(TargetName).lib - false - false - ../../RedAlert.exe - - - - - Level3 - Disabled - true - true - - - - - Level3 - MaxSpeed - true - true - true - true - - - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 4Bytes - 4Bytes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - Document - true - 1 - true - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/REDALERT/RedAlert.vcxproj.filters b/REDALERT/RedAlert.vcxproj.filters deleted file mode 100644 index d6717d8..0000000 --- a/REDALERT/RedAlert.vcxproj.filters +++ /dev/null @@ -1,1970 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {fd6d77c9-ab70-415f-80a5-2f3e9fafc730} - - - {f4599de7-e877-410c-943f-afc4bef70eb6} - - - {3254aa87-c780-4496-a35f-35ab3a6d4cc1} - - - {fa43d876-162b-41ea-8b7e-71173f2a1c5c} - - - {70d28e5f-2ea4-4579-b2b9-b07f5a3b816c} - - - {df491552-a4a6-4df3-8a5b-78944d7db696} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\ddraw - - - Source Files\ddraw - - - Source Files\ddraw - - - Source Files\ddraw - - - Source Files\ddraw - - - Source Files\libsmacker - - - Source Files\libsmacker - - - Source Files\libsmacker - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\imgui - - - Source Files\imgui - - - Source Files\imgui - - - Source Files\imgui - - - Source Files\imgui - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Header Files - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Resource - - - Source Files - - - Source Files - - - Source Files - - - Source Files\ddraw - - - Source Files\ddraw - - - Source Files\ddraw - - - Source Files\libsmacker - - - Source Files\libsmacker - - - Source Files\libsmacker - - - Source Files\libsmacker - - - Source Files\win32lib - - - Source Files\imgui - - - Source Files\imgui - - - Source Files\imgui - - - Source Files\imgui - - - Source Files\imgui - - - Source Files\imgui - - - Source Files\imgui - - - Source Files\imgui - - - - - Source Files - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - Source Files\win32lib - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files\win32lib - - - Source Files\win32lib - - - - - Source Files\Resource - - - - - Source Files\external - - - Source Files\external - - - Source Files\external - - - \ No newline at end of file diff --git a/REDALERT/WIN32LIB/GBUFFER.H b/REDALERT/WIN32LIB/GBUFFER.H index 8d9707e..04b9183 100644 --- a/REDALERT/WIN32LIB/GBUFFER.H +++ b/REDALERT/WIN32LIB/GBUFFER.H @@ -290,6 +290,8 @@ class GraphicViewPortClass { unsigned long Print(int num, int x_pixel, int y_pixel, int fcol, int bcol); unsigned long Print(long num, int x_pixel, int y_pixel, int fcol, int bcol); + int Get_Full_Pitch() { return Get_Pitch() + Get_XAdd() + Get_Width(); } + /*===================================================================*/ /* Define the list of graphic functions which work only with a */ /* graphic buffer. */ @@ -366,7 +368,7 @@ class GraphicBufferClass : public GraphicViewPortClass, public BufferClass { void DD_Init(GBC_Enum flags); void Init(int w, int h, void *buffer, long size, GBC_Enum flags); void Un_Init(void); - void GraphicBufferClass::Attach_DD_Surface (GraphicBufferClass * attach_buffer); + void Attach_DD_Surface (GraphicBufferClass * attach_buffer); BOOL Lock(void); BOOL Unlock(void); diff --git a/TIBERIANDAWN/TiberianDawn.vcxproj b/TIBERIANDAWN/TiberianDawn.vcxproj deleted file mode 100644 index 0896ad2..0000000 --- a/TIBERIANDAWN/TiberianDawn.vcxproj +++ /dev/null @@ -1,566 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {1380ED08-82A3-49C2-A171-1915574B3382} - Win32Proj - TiberianDawn - SAK - SAK - SAK - SAK - 8.1 - - - - DynamicLibrary - true - MultiByte - v141 - - - DynamicLibrary - false - false - MultiByte - v141 - - - - - - - - - - - - - - false - ..\bin\$(PlatformName)\ - $(PlatformName)\$(Configuration)\ - $(ProjectName)I - - - false - ..\bin\$(PlatformName)\ - $(PlatformName)\$(Configuration)\ - - - - - - Level3 - Disabled - TRUE_FALSE_DEFINED;WIN32;_DEBUG;_WINDOWS;_USRDLL;TIBERIANDAWN_EXPORTS;%(PreprocessorDefinitions) - ./win32lib - ProgramDatabase - false - MultiThreadedDebug - 4800;4244;4996 - true - 1Byte - false - true - - - Windows - winmm.lib;Ws2_32.lib;%(AdditionalDependencies) - false - false - false - - - DebugFull - - - - - - - - - Level3 - - - MaxSpeed - true - true - TRUE_FALSE_DEFINED;WIN32;NDEBUG;_WINDOWS;_USRDLL;TIBERIANDAWN_EXPORTS;%(PreprocessorDefinitions) - ./win32lib - 4800;4244;4996 - false - MultiThreaded - false - true - 1Byte - true - - - Windows - DebugFull - true - true - winmm.lib;Ws2_32.lib;%(AdditionalDependencies) - - false - false - - - - - - - - - - true - 1 - true - 1 - - - - Document - true - 1 - 1 - true - - - - Document - - - - - Document - 1 - 1 - true - true - - - - - Document - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/TIBERIANDAWN/TiberianDawn.vcxproj.filters b/TIBERIANDAWN/TiberianDawn.vcxproj.filters deleted file mode 100644 index fa54c35..0000000 --- a/TIBERIANDAWN/TiberianDawn.vcxproj.filters +++ /dev/null @@ -1,1235 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - * - - - {8f4fa00c-59af-42a6-824b-61fde12b0c64} - - - {7bd10c3e-67f3-4051-a861-06db6191bb48} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Resources - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - Source Files - - - Source Files\Win32Lib - - - Source Files - - - Source Files - - - - Source Files - - - - - Source Files\Win32Lib - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Win32Lib - - - Source Files\Win32Lib - - - - - Source Files\Resources - - - \ No newline at end of file diff --git a/ddraw/ddrawwrapper/DirectDrawWrapper.h b/ddraw/ddrawwrapper/DirectDrawWrapper.h index 5f209a6..776ce9d 100644 --- a/ddraw/ddrawwrapper/DirectDrawWrapper.h +++ b/ddraw/ddrawwrapper/DirectDrawWrapper.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include #ifndef H_DDW #define H_DDW diff --git a/external/dxsdk/Include/ddraw.h b/external/dxsdk/Include/ddraw2.h similarity index 99% rename from external/dxsdk/Include/ddraw.h rename to external/dxsdk/Include/ddraw2.h index 05a72b7..a6159a0 100644 --- a/external/dxsdk/Include/ddraw.h +++ b/external/dxsdk/Include/ddraw2.h @@ -10,7 +10,6 @@ #ifndef __DDRAW_INCLUDED__ #define __DDRAW_INCLUDED__ - // Always disable warning C4201: "nonstandard extension used : // nameless struct/union" #if _MSC_VER >= 1200